Merge branch 'nd/exclusion-regression-fix'
[git] / xdiff / xmerge.c
2016-02-24  Junio C HamanoMerge branch 'ce/https-public-key-pinning'
2016-02-24  Junio C HamanoMerge branch 'bc/http-empty-auth'
2016-02-24  Junio C HamanoMerge branch 'sp/remote-curl-ssl-strerror'
2016-02-24  Junio C HamanoMerge branch 'ew/force-ipv4'
2016-02-24  Junio C HamanoMerge branch 'nd/git-common-dir-fix'
2016-02-24  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22  Junio C HamanoMerge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2016-02-22  Junio C HamanoMerge branch 'ew/connect-verbose'
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-02-22  Junio C HamanoMerge branch 'pw/completion-stash' into maint
2016-02-22  Junio C HamanoMerge branch 'mm/clean-doc-fix' into maint
2016-02-22  Junio C HamanoMerge branch 'dw/mergetool-vim-window-shuffle' into...
2016-02-22  Junio C HamanoMerge branch 'ah/stripspace-optstring' into maint
2016-02-22  Junio C HamanoMerge branch 'pw/completion-stash'
2016-02-17  Junio C HamanoMerge branch 'dw/mergetool-vim-window-shuffle'
2016-02-17  Junio C HamanoMerge branch 'ah/stripspace-optstring'
2016-02-17  Junio C HamanoMerge branch 'mm/clean-doc-fix'
2016-02-17  Junio C HamanoMerge branch 'jk/rerere-xsnprintf'
2016-02-17  Junio C HamanoMerge branch 'jk/test-path-utils-xsnprintf'
2016-02-17  Junio C HamanoMerge branch 'da/user-useconfigonly'
2016-02-17  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-02-17  Junio C HamanoMerge branch 'mg/mingw-test-fix'
2016-02-17  Junio C HamanoMerge branch 'js/mingw-tests'
2016-02-17  Junio C HamanoMerge branch 'jk/drop-rsync-transport'
2016-02-17  Junio C HamanoMerge branch 'js/test-lib-windows-emulated-yes' into...
2016-02-17  Junio C HamanoMerge branch 'aw/push-force-with-lease-reporting' into...
2016-02-17  Junio C HamanoMerge branch 'nd/do-not-move-worktree-manually' into...
2016-02-17  Junio C HamanoMerge branch 'js/xmerge-marker-eol' into maint
2016-02-10  Junio C HamanoMerge branch 'js/test-lib-windows-emulated-yes'
2016-02-10  Junio C HamanoMerge branch 'wp/sha1-name-negative-match'
2016-02-10  Junio C HamanoMerge branch 'jk/options-cleanup'
2016-02-10  Junio C HamanoMerge branch 'aw/push-force-with-lease-reporting'
2016-02-10  Junio C HamanoMerge branch 'ls/clean-smudge-override-in-config'
2016-02-10  Junio C HamanoMerge branch 'ew/connect-verbose'
2016-02-10  Junio C HamanoMerge branch 'cc/untracked'
2016-02-10  Junio C HamanoMerge branch 'js/xmerge-marker-eol'
2016-02-05  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'ew/for-each-ref-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/user-manual' into maint
2016-02-05  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into maint
2016-01-27  Johannes Schindelinmerge-file: ensure that conflict sections match eol...
2016-01-27  Johannes Schindelinmerge-file: let conflict markers match end-of-line...
2016-01-20  Junio C HamanoMerge branch 'ss/clone-depth-single-doc'
2016-01-20  Junio C HamanoMerge branch 'ew/for-each-ref-doc'
2016-01-20  Junio C HamanoMerge branch 'ss/user-manual'
2016-01-20  Junio C HamanoMerge branch 'jk/pack-revindex'
2016-01-12  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree'
2015-12-22  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into nd/clear...
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-12-01  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25  Jeff KingMerge branch 'rc/configure-use-libs-when-checking-a...
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top' into maint
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-ff' into maint
2015-11-04  Junio C HamanoMerge branch 'xf/user-manual-markup' into maint
2015-11-03  Junio C HamanoMerge branch 'jk/merge-file-exit-code' into maint
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30  Junio C HamanoMerge branch 'jk/merge-file-exit-code'
2015-10-30  Junio C HamanoMerge branch 'xf/user-manual-ff'
2015-10-30  Junio C HamanoMerge branch 'jc/add-u-A-default-to-top'
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-29  Junio C HamanoMerge branch 'xf/user-manual-markup'
2015-10-20  Junio C HamanoMerge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16  Junio C HamanoMerge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16  Junio C HamanoMerge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16  Junio C HamanoMerge branch 'sb/http-flaky-test-fix' into maint
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16  Junio C HamanoMerge branch 'jw/make-arflags-customizable' into maint
2015-10-15  Junio C HamanoMerge branch 'sb/http-flaky-test-fix'
2015-10-14  Junio C HamanoMerge branch 'jk/asciidoctor-section-heading-markup...
2015-10-05  Junio C HamanoMerge branch 'jw/make-arflags-customizable'
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix'
2015-09-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix'
2015-09-17  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' into...
2015-09-17  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test'
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix'
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-09-04  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full' into...
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes'
2015-09-01  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string'
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings'
2015-09-01  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config'
2015-08-31  Junio C HamanoMerge branch 'sg/describe-contains'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-08-25  Junio C HamanoMerge branch 'jh/strbuf-read-use-read-in-full'
2015-08-19  Junio C HamanoMerge branch 'jc/finalize-temp-file'
2015-08-19  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-19  Junio C HamanoMerge branch 'nd/export-worktree' into maint
2015-08-19  Junio C HamanoMerge branch 'as/sparse-checkout-removal' into maint
2015-08-19  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head...
2015-08-12  Junio C HamanoMerge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-03  Junio C HamanoMerge branch 'jx/do-not-crash-receive-pack-wo-head'
2015-08-03  Junio C HamanoMerge branch 'as/sparse-checkout-removal'
2015-08-03  Junio C HamanoMerge branch 'jc/commit-slab'
next