git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - builtin-merge-file.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / builtin-merge-file.c

2010-01-23	Junio C Hamano	Merge branch 'jc/maint-limit-note-output'	blob \| commitdiff \| raw
2010-01-23	Junio C Hamano	Merge branch 'nd/ls-files-sparse-fix'	blob \| commitdiff \| raw
2010-01-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2010-01-21	Junio C Hamano	Merge branch 'bw/cvsimport'	blob \| commitdiff \| raw
2010-01-21	Junio C Hamano	Merge branch 'jc/checkout-merge-base'	blob \| commitdiff \| raw
2010-01-21	Junio C Hamano	Merge branch 'ag/patch-header-verify'	blob \| commitdiff \| raw
2010-01-21	Junio C Hamano	Merge branch 'jc/conflict-marker-size'	blob \| commitdiff \| raw
2010-01-21	Junio C Hamano	Merge branch 'ag/maint-apply-too-large-p'	blob \| commitdiff \| raw \| diff to current
2010-01-21	Junio C Hamano	Merge branch 'ap/merge-backend-opts'	blob \| commitdiff \| raw \| diff to current
2010-01-19	Junio C Hamano	Merge branch 'maint-1.6.3' into maint-1.6.4	blob \| commitdiff \| raw \| diff to current
2010-01-17	Junio C Hamano	Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'	blob \| commitdiff \| raw \| diff to current
2010-01-17	Junio C Hamano	xdl_merge(): introduce xmparam_t for merge specific...	blob \| commitdiff \| raw \| diff to current
2010-01-10	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw \| diff to current
2010-01-10	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-12-31	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-30	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-30	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-12-27	Junio C Hamano	Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...	blob \| commitdiff \| raw \| diff to current
2009-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-12-09	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'jc/maint-am-keep' into maint	blob \| commitdiff \| raw \| diff to current
2009-12-03	Junio C Hamano	Merge branch 'np/maint-sideband-favor-status' into...	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	Merge branch 'jc/maint-am-keep'	blob \| commitdiff \| raw \| diff to current
2009-11-30	Junio C Hamano	git-merge-file --ours, --theirs	blob \| commitdiff \| raw \| diff to current
2009-11-18	Junio C Hamano	Merge branch 'np/maint-sideband-favor-status'	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jk/maint-1.6.3-ls-files-i' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'jc/maint-1.6.3-graft-trailing-space'...	blob \| commitdiff \| raw \| diff to current
2009-11-16	Junio C Hamano	Merge branch 'tr/maint-roff-quote' into maint	blob \| commitdiff \| raw \| diff to current
2009-11-10	Junio C Hamano	Merge branch 'jk/maint-1.6.3-ls-files-i'	blob \| commitdiff \| raw \| diff to current
2009-10-31	Junio C Hamano	Merge branch 'jc/maint-1.6.3-graft-trailing-space'	blob \| commitdiff \| raw \| diff to current
2009-10-31	Junio C Hamano	Merge branch 'tr/maint-roff-quote'	blob \| commitdiff \| raw \| diff to current
2009-10-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-10-25	Junio C Hamano	Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...	blob \| commitdiff \| raw \| diff to current
2009-10-25	Junio C Hamano	Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...	blob \| commitdiff \| raw \| diff to current
2009-10-24	Junio C Hamano	Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...	blob \| commitdiff \| raw \| diff to current
2009-10-19	Junio C Hamano	Merge branch 'jn/maint-1.6.3-check-ref-format-doc'	blob \| commitdiff \| raw \| diff to current
2009-10-19	Junio C Hamano	Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'	blob \| commitdiff \| raw \| diff to current
2009-10-04	Junio C Hamano	Merge branch 'jc/maint-1.6.4-show-branch-default' into...	blob \| commitdiff \| raw \| diff to current
2009-09-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-09-16	Junio C Hamano	Merge branch 'jc/maint-unpack-objects-strict' into...	blob \| commitdiff \| raw \| diff to current
2009-09-16	Junio C Hamano	Merge branch 'tf/diff-whitespace-incomplete-line' into...	blob \| commitdiff \| raw \| diff to current
2009-09-16	Junio C Hamano	Merge branch 'jk/maint-1.6.3-checkout-unborn' into...	blob \| commitdiff \| raw \| diff to current
2009-09-15	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...	blob \| commitdiff \| raw \| diff to current
2009-09-15	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...	blob \| commitdiff \| raw \| diff to current
2009-09-15	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...	blob \| commitdiff \| raw \| diff to current
2009-09-15	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...	blob \| commitdiff \| raw \| diff to current
2009-09-13	Junio C Hamano	Merge branch 'cb/maint-1.6.3-grep-relative-up' into...	blob \| commitdiff \| raw \| diff to current
2009-09-07	Junio C Hamano	Merge branch 'np/maint-1.6.3-deepen'	blob \| commitdiff \| raw \| diff to current
2009-09-03	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-09-03	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-09-01	Junio C Hamano	Merge branch 'tf/diff-whitespace-incomplete-line'	blob \| commitdiff \| raw \| diff to current
2009-08-29	Junio C Hamano	Merge branch 'jk/maint-1.6.3-checkout-unborn'	blob \| commitdiff \| raw \| diff to current
2009-08-29	Junio C Hamano	Merge branch 'np/maint-1.6.3-deepen'	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-08-27	Junio C Hamano	Merge branch 'jc/maint-unpack-objects-strict'	blob \| commitdiff \| raw \| diff to current
2009-08-26	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-21	Junio C Hamano	Merge branch 'jc/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-19	Junio C Hamano	Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-08-12	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-11	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-11	Junio C Hamano	Merge branch 'jc/maint-merge-recursive-fix'	blob \| commitdiff \| raw \| diff to current
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-08-05	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-07-29	Junio C Hamano	Merge branch 'hv/cvsps-tests'	blob \| commitdiff \| raw \| diff to current
2009-07-29	Junio C Hamano	Sync with 1.6.3.4	blob \| commitdiff \| raw \| diff to current
2009-07-26	Junio C Hamano	Merge branch 'gp/maint-rebase-p-onto'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'js/maint-graft-unhide-true-parents'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'av/maint-config-reader'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'jk/maint-send-email-alias-loop'	blob \| commitdiff \| raw \| diff to current
2009-07-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-11	Junio C Hamano	Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'	blob \| commitdiff \| raw \| diff to current
2009-07-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-06	Junio C Hamano	Merge branch 'cb/maint-fetch-refspec-wo-dst'	blob \| commitdiff \| raw \| diff to current
2009-07-06	Junio C Hamano	Merge branch 'gb/am-foreign'	blob \| commitdiff \| raw \| diff to current
2009-07-02	Junio C Hamano	Merge branch 'cc/bisect'	blob \| commitdiff \| raw \| diff to current
2009-07-02	Junio C Hamano	Merge branch 'cf/maint-remote-uploadpack-useconfig...	blob \| commitdiff \| raw \| diff to current
2009-07-02	Junio C Hamano	Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'	blob \| commitdiff \| raw \| diff to current
2009-07-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-06-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-06-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-06-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-06-22	Junio C Hamano	Merge branch 'sb/maint-1.6.0-add-config-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-06-22	Junio C Hamano	Sync with 1.6.3.3	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'ph/submodule-rebase'	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'jc/cache-tree'	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'mn/maint-iconv-autoconf'	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'pb/maint-1.6.2-userdiff-fix'	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'sb/maint-1.6.0-add-config-fix'	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'lt/maint-unsigned-left-shift'	blob \| commitdiff \| raw \| diff to current
2009-06-20	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-06-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom