]> git.ipfire.org Git - thirdparty/git.git/history - builtin-merge-file.c
Merge branch 'jc/maint-imap-config-parse' into maint
[thirdparty/git.git] / builtin-merge-file.c
2010-02-08  Junio C HamanoMerge branch 'jc/maint-imap-config-parse' into maint
2010-02-08  Junio C HamanoMerge branch 'jc/maint-doc-git-add-example' into maint
2010-01-24  Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-19  Junio C HamanoMerge branch 'maint-1.6.3' into maint-1.6.4
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.2' into maint
2010-01-10  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-31  Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-12-30  Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-12-30  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-27  Junio C HamanoMerge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-12-09  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03  Junio C HamanoMerge branch 'jc/maint-am-keep' into maint
2009-12-03  Junio C HamanoMerge branch 'np/maint-sideband-favor-status' into...
2009-11-30  Junio C HamanoMerge branch 'jc/maint-am-keep'
2009-11-18  Junio C HamanoMerge branch 'np/maint-sideband-favor-status'
2009-11-16  Junio C HamanoMerge branch 'jk/maint-1.6.3-ls-files-i' into maint
2009-11-16  Junio C HamanoMerge branch 'jc/maint-1.6.3-graft-trailing-space'...
2009-11-16  Junio C HamanoMerge branch 'tr/maint-roff-quote' into maint
2009-11-10  Junio C HamanoMerge branch 'jk/maint-1.6.3-ls-files-i'
2009-10-31  Junio C HamanoMerge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31  Junio C HamanoMerge branch 'tr/maint-roff-quote'
2009-10-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-10-25  Junio C HamanoMerge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
2009-10-25  Junio C HamanoMerge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24  Junio C HamanoMerge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-19  Junio C HamanoMerge branch 'jn/maint-1.6.3-check-ref-format-doc'
2009-10-19  Junio C HamanoMerge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
2009-10-04  Junio C HamanoMerge branch 'jc/maint-1.6.4-show-branch-default' into...
2009-09-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-16  Junio C HamanoMerge branch 'jc/maint-unpack-objects-strict' into...
2009-09-16  Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-16  Junio C HamanoMerge branch 'jk/maint-1.6.3-checkout-unborn' into...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15  Junio C HamanoMerge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-13  Junio C HamanoMerge branch 'cb/maint-1.6.3-grep-relative-up' into...
2009-09-07  Junio C HamanoMerge branch 'np/maint-1.6.3-deepen'
2009-09-03  Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-09-03  Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-09-01  Junio C HamanoMerge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29  Junio C HamanoMerge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29  Junio C HamanoMerge branch 'np/maint-1.6.3-deepen'
2009-08-28  Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-28  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-08-27  Junio C HamanoMerge branch 'jc/maint-unpack-objects-strict'
2009-08-26  Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-21  Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19  Junio C HamanoMerge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-16  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-12  Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-11  Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-11  Junio C HamanoMerge branch 'jc/maint-merge-recursive-fix'
2009-08-08  Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-08-08  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-08-05  Junio C HamanoMerge branch 'maint-1.6.3' into maint
2009-07-29  Junio C HamanoMerge branch 'hv/cvsps-tests'
2009-07-29  Junio C HamanoSync with 1.6.3.4
2009-07-26  Junio C HamanoMerge branch 'gp/maint-rebase-p-onto'
2009-07-25  Junio C HamanoMerge branch 'maint'
2009-07-25  Junio C HamanoMerge branch 'maint'
2009-07-25  Junio C HamanoMerge branch 'js/maint-graft-unhide-true-parents'
2009-07-25  Junio C HamanoMerge branch 'av/maint-config-reader'
2009-07-25  Junio C HamanoMerge branch 'jk/maint-send-email-alias-loop'
2009-07-24  Junio C HamanoMerge branch 'maint'
2009-07-23  Junio C HamanoMerge branch 'maint'
2009-07-18  Junio C HamanoMerge branch 'maint'
2009-07-11  Junio C HamanoMerge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'
2009-07-08  Junio C HamanoMerge branch 'maint'
2009-07-06  Junio C HamanoMerge branch 'cb/maint-fetch-refspec-wo-dst'
2009-07-06  Junio C HamanoMerge branch 'gb/am-foreign'
2009-07-02  Junio C HamanoMerge branch 'cc/bisect'
2009-07-02  Junio C HamanoMerge branch 'cf/maint-remote-uploadpack-useconfig...
2009-07-02  Junio C HamanoMerge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-07-02  Junio C HamanoMerge branch 'maint'
2009-06-30  Junio C HamanoMerge branch 'maint'
2009-06-27  Junio C HamanoMerge branch 'maint'
2009-06-22  Junio C HamanoMerge branch 'maint'
2009-06-22  Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-22  Junio C HamanoSync with 1.6.3.3
2009-06-21  Junio C HamanoMerge branch 'maint'
2009-06-21  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21  Junio C HamanoMerge branch 'ph/submodule-rebase'
2009-06-21  Junio C HamanoMerge branch 'jc/cache-tree'
2009-06-21  Junio C HamanoMerge branch 'mn/maint-iconv-autoconf'
2009-06-21  Junio C HamanoMerge branch 'pb/maint-1.6.2-userdiff-fix'
2009-06-21  Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-21  Junio C HamanoMerge branch 'lt/maint-unsigned-left-shift'
2009-06-20  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-18  Junio C HamanoMerge branch 'maint'
2009-06-18  Junio C HamanoMerge branch 'ak/maint-for-each-ref-no-lookup'
2009-06-14  Junio C HamanoMerge branch 'maint'
2009-06-14  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-13  Junio C HamanoMerge branch 'rc/http-push'
2009-06-13  Junio C HamanoMerge branch 'cc/bisect' (early part)
2009-06-13  Junio C HamanoMerge branch 'rc/maint-http-local-slot-fix'
2009-06-13  Junio C HamanoMerge branch 'cb/maint-no-double-merge'
2009-06-13  Junio C HamanoMerge branch 'ph/submodule-rebase' (early part)
2009-06-13  Junio C HamanoMerge branch 'bc/solaris'
next