Andrew's git - gitweb.git/history

[gitweb.git] / xdiff / xmerge.c

2016-02-26	Merge branch 'ps/plug-xdl-merge-leak'	blob \| diff \| raw
2016-02-26	Merge branch 'mm/push-simple-doc'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'ps/config-error'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'mg/work-tree-tests'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'ls/config-origin'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'jk/tighten-alloc'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'jk/more-comments-on-textconv'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'jk/no-diff-emit-common'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'ak/git-strip-extension-from-dashed-command'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'ak/extract-argv0-last-dir-sep'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'kn/ref-filter-atom-parsing'	blob \| diff \| raw \| diff to current
2016-02-26	Merge branch 'tg/git-remote'	blob \| diff \| raw \| diff to current
2016-02-24	Merge branch 'jc/am-i-v-fix'	blob \| diff \| raw \| diff to current
2016-02-24	Merge branch 'ce/https-public-key-pinning'	blob \| diff \| raw \| diff to current
2016-02-24	Merge branch 'bc/http-empty-auth'	blob \| diff \| raw \| diff to current
2016-02-24	Merge branch 'sp/remote-curl-ssl-strerror'	blob \| diff \| raw \| diff to current
2016-02-24	Merge branch 'ew/force-ipv4'	blob \| diff \| raw \| diff to current
2016-02-24	Merge branch 'nd/git-common-dir-fix'	blob \| diff \| raw \| diff to current
2016-02-24	Merge branch 'nd/dwim-wildcards-as-pathspecs'	blob \| diff \| raw \| diff to current
2016-02-23	xdiff/xmerge: fix memory leak in xdl_merge	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'js/git-remote-add-url-insteadof-test'	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'jk/config-include'	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'ew/connect-verbose'	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'nd/ita-cleanup' into maint	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'pw/completion-stash' into maint	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'mm/clean-doc-fix' into maint	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'dw/mergetool-vim-window-shuffle' into...	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'ah/stripspace-optstring' into maint	blob \| diff \| raw \| diff to current
2016-02-22	Merge branch 'pw/completion-stash'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'dw/mergetool-vim-window-shuffle'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'ah/stripspace-optstring'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'mm/clean-doc-fix'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'jk/rerere-xsnprintf'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'jk/test-path-utils-xsnprintf'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'da/user-useconfigonly'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'nd/clear-gitenv-upon-use-of-alias'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'mg/mingw-test-fix'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'js/mingw-tests'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'jk/drop-rsync-transport'	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'js/test-lib-windows-emulated-yes' into...	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'aw/push-force-with-lease-reporting' into...	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'nd/do-not-move-worktree-manually' into...	blob \| diff \| raw \| diff to current
2016-02-17	Merge branch 'js/xmerge-marker-eol' into maint	blob \| diff \| raw \| diff to current
2016-02-10	Merge branch 'js/test-lib-windows-emulated-yes'	blob \| diff \| raw \| diff to current
2016-02-10	Merge branch 'wp/sha1-name-negative-match'	blob \| diff \| raw \| diff to current
2016-02-10	Merge branch 'jk/options-cleanup'	blob \| diff \| raw \| diff to current
2016-02-10	Merge branch 'aw/push-force-with-lease-reporting'	blob \| diff \| raw \| diff to current
2016-02-10	Merge branch 'ls/clean-smudge-override-in-config'	blob \| diff \| raw \| diff to current
2016-02-10	Merge branch 'ew/connect-verbose'	blob \| diff \| raw \| diff to current
2016-02-10	Merge branch 'cc/untracked'	blob \| diff \| raw \| diff to current
2016-02-10	Merge branch 'js/xmerge-marker-eol'	blob \| diff \| raw \| diff to current
2016-02-05	Merge branch 'ss/clone-depth-single-doc' into maint	blob \| diff \| raw \| diff to current
2016-02-05	Merge branch 'ew/for-each-ref-doc' into maint	blob \| diff \| raw \| diff to current
2016-02-05	Merge branch 'ss/user-manual' into maint	blob \| diff \| raw \| diff to current
2016-02-05	Merge branch 'nd/stop-setenv-work-tree' into maint	blob \| diff \| raw \| diff to current
2016-01-27	merge-file: ensure that conflict sections match eol...	blob \| diff \| raw \| diff to current
2016-01-27	merge-file: let conflict markers match end-of-line...	blob \| diff \| raw \| diff to current
2016-01-20	Merge branch 'ss/clone-depth-single-doc'	blob \| diff \| raw \| diff to current
2016-01-20	Merge branch 'ew/for-each-ref-doc'	blob \| diff \| raw \| diff to current
2016-01-20	Merge branch 'ss/user-manual'	blob \| diff \| raw \| diff to current
2016-01-20	Merge branch 'jk/pack-revindex'	blob \| diff \| raw \| diff to current
2016-01-12	Merge branch 'nd/stop-setenv-work-tree'	blob \| diff \| raw \| diff to current
2015-12-22	Merge branch 'nd/stop-setenv-work-tree' into nd/clear...	blob \| diff \| raw \| diff to current
2015-12-21	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-12-01	Merge branch 'rc/configure-use-libs-when-checking-a...	blob \| diff \| raw \| diff to current
2015-11-25	Merge branch 'rc/configure-use-libs-when-checking-a...	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| diff \| raw \| diff to current
2015-11-05	Merge branch 'jc/add-u-A-default-to-top' into maint	blob \| diff \| raw \| diff to current
2015-11-04	Merge branch 'xf/user-manual-ff' into maint	blob \| diff \| raw \| diff to current
2015-11-04	Merge branch 'xf/user-manual-markup' into maint	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'jk/merge-file-exit-code' into maint	blob \| diff \| raw \| diff to current
2015-11-03	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'jk/merge-file-exit-code'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'xf/user-manual-ff'	blob \| diff \| raw \| diff to current
2015-10-30	Merge branch 'jc/add-u-A-default-to-top'	blob \| diff \| raw \| diff to current
2015-10-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-10-29	Merge branch 'xf/user-manual-markup'	blob \| diff \| raw \| diff to current
2015-10-20	Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jk/asciidoctor-section-heading-markup...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'sb/http-flaky-test-fix' into maint	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jw/make-arflags-customizable' into maint	blob \| diff \| raw \| diff to current
2015-10-15	Merge branch 'sb/http-flaky-test-fix'	blob \| diff \| raw \| diff to current
2015-10-14	Merge branch 'jk/asciidoctor-section-heading-markup...	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jw/make-arflags-customizable'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'as/config-doc-markup-fix'	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'br/svn-doc-include-paths-config' into...	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'ah/submodule-typofix-in-error' into maint	blob \| diff \| raw \| diff to current
2015-09-14	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'mp/t7060-diff-index-test'	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'gb/apply-comment-typofix'	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'ee/clean-test-fixes' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'sg/t3020-typofix' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'jh/strbuf-read-use-read-in-full' into...	blob \| diff \| raw \| diff to current
2015-09-02	Merge branch 'ee/clean-test-fixes'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'ah/submodule-typofix-in-error'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'ah/reflog-typofix-in-error'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'ah/read-tree-usage-string'	blob \| diff \| raw \| diff to current
next