Sync with 2.3.10
[gitweb.git] / combine-diff.c
2015-09-28 Sync with 2.3.10
2015-09-28 Merge branch 'jk/xdiff-memory-limits' into maint-2.3
2015-09-28 react to errors in xdi_diff
2015-09-04 Sync with 2.3.9
2015-08-03 Merge branch 'js/rebase-i-clean-up-upon-continue-to...
2015-08-03 Merge branch 'sg/completion-commit-cleanup' into maint
2015-08-03 Merge branch 'pt/am-abort-fix' into maint
2015-08-03 Merge branch 'mh/reporting-broken-refs-from-for-each...
2015-08-03 Merge branch 'sg/commit-cleanup-scissors' into maint
2015-07-27 Merge branch 'jk/pretty-encoding-doc' into maint
2015-07-27 Merge branch 'tb/checkout-doc' into maint
2015-07-27 Merge branch 'mm/branch-doc-updates' into maint
2015-07-27 Merge branch 'jc/fsck-retire-require-eoh' into maint
2015-07-27 Merge branch 'et/http-proxyauth' into maint
2015-07-27 Merge branch 'jc/unexport-git-pager-in-use-in-pager...
2015-07-27 Merge branch 'jk/rev-list-no-bitmap-while-pruning'...
2015-07-27 Merge branch 'rh/test-color-avoid-terminfo-in-original...
2015-07-27 Merge branch 'jk/fix-refresh-utime' into maint
2015-07-27 Merge branch 'cb/rebase-am-exit-code' into maint
2015-07-27 Merge branch 'jk/index-pack-reduce-recheck' into maint
2015-07-15 Merge branch 'mm/describe-doc' into maint
2015-07-15 Merge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15 Merge branch 'es/osx-header-pollutes-mask-macro' into...
2015-07-15 Merge branch 'es/utf8-stupid-compiler-workaround' into...
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint
2015-07-15 Merge branch 'pt/t0302-needs-sanity' into maint
2015-07-15 Merge branch 'me/fetch-into-shallow-safety' into maint
2015-07-15 Merge branch 'mh/fsck-reflog-entries' into maint
2015-07-15 Merge branch 'af/tcsh-completion-noclobber' into maint
2015-07-15 Merge branch 'pa/auto-gc-mac-osx' into maint
2015-07-15 Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks...
2015-06-26 Merge branch 'jk/stash-require-clean-index' into maint
2015-06-26 Merge branch 'cb/array-size' into maint
2015-06-25 Merge branch 'sg/merge-summary-config' into maint
2015-06-25 Merge branch 'jk/make-fix-dependencies' into maint
2015-06-25 Merge branch 'sb/pack-protocol-mention-smart-http'...
2015-06-25 Merge branch 'jk/die-on-bogus-worktree-late' into maint
2015-06-25 Merge branch 'pt/pull-tags-error-diag' into maint
2015-06-25 Merge branch 'jk/color-diff-plain-is-context' into...
2015-06-25 Merge branch 'mm/rebase-i-post-rewrite-exec' into maint
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-16 Merge branch 'dt/clean-pathspec-filter-then-lstat'...
2015-06-16 Merge branch 'jh/filter-empty-contents' into maint
2015-06-16 Merge branch 'mm/log-format-raw-doc' into maint
2015-06-05 Merge branch 'jk/skip-http-tests-under-no-curl' into...
2015-06-05 Merge branch 'jk/rerere-forget-check-enabled' into...
2015-06-05 Merge branch 'ja/tutorial-asciidoctor-fix' into maint
2015-06-05 Merge branch 'jk/stripspace-asciidoctor-fix' into maint
2015-06-05 Merge branch 'ps/bundle-verify-arg' into maint
2015-06-05 Merge branch 'sb/t1020-cleanup' into maint
2015-06-05 Merge branch 'jc/gitignore-precedence' into maint
2015-06-05 Merge branch 'jk/add-e-kill-editor' into maint
2015-06-05 Merge branch 'jk/sha1-file-reduce-useless-warnings...
2015-06-05 Merge branch 'tb/blame-resurrect-convert-to-git' into...
2015-06-05 Merge branch 'jc/plug-fmt-merge-msg-leak' into maint
2015-05-27 diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
2015-05-26 Merge branch 'jk/still-interesting' into maint
2015-05-26 Merge branch 'jk/rebase-quiet-noop' into maint
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-26 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-05-13 Merge branch 'nd/t1509-chroot-test' into maint
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
2015-05-13 Merge branch 'jk/init-core-worktree-at-root' into maint
2015-05-11 Merge branch 'jc/diff-no-index-d-f' into maint-2.3
2015-05-11 Merge branch 'oh/fix-config-default-user-name-section...
2015-05-11 Merge branch 'jc/epochtime-wo-tz' into maint-2.3
2015-04-28 Merge branch 'mg/show-notes-doc'
2015-04-27 Merge branch 'ma/bash-completion-leaking-x' into maint
2015-04-27 Merge branch 'jc/push-cert' into maint
2015-04-21 Merge branch 'pt/enter-repo-comment-fix' into maint
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21 Merge branch 'jk/cherry-pick-docfix' into maint
2015-04-21 Merge branch 'iu/fix-parse-options-h-comment' into...
2015-04-21 Merge branch 'jg/cguide-we-cannot-count' into maint
2015-04-21 Merge branch 'jn/doc-fast-import-no-16-octopus-limit...
2015-04-20 Merge branch 'ps/grep-help-all-callback-arg'
2015-04-20 Merge branch 'va/fix-git-p4-tests'
2015-04-20 Merge branch 'jc/push-cert'
2015-04-20 Merge branch 'ma/bash-completion-leaking-x'
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'jk/merge-quiet'
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jn/doc-fast-import-no-16-octopus-limit'
2015-04-14 Merge branch 'sb/plug-wt-shortstatus-tracking-leak'
2015-04-14 Merge branch 'pt/enter-repo-comment-fix'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-04-14 Merge branch 'jk/cherry-pick-docfix'
2015-04-14 Merge branch 'iu/fix-parse-options-h-comment'
2015-04-14 Merge branch 'jg/cguide-we-cannot-count'
2015-03-31 Merge branch 'ss/pull-rebase-preserve' into maint
2015-03-31 Merge branch 'jc/report-path-error-to-dir' into maint
2015-03-31 Merge branch 'ph/push-doc-cas' into maint
2015-03-28 Merge branch 'ph/push-doc-cas'
2015-03-28 Merge branch 'ss/pull-rebase-preserve'
2015-03-28 Merge branch 'jk/simplify-csum-file-sha1fd-check' into...
2015-03-28 Merge branch 'nd/doc-git-index-version' into maint
2015-03-28 Merge branch 'ct/prompt-untracked-fix' into maint
2015-03-28 Merge branch 'ws/grep-quiet-no-pager' into maint
2015-03-28 Merge branch 'jc/submitting-patches-mention-send-email...
2015-03-28 Merge branch 'jk/cleanup-failed-clone' into maint
next