merge_trees(): add ancestor label parameter for diff3-style output
[git] / wrapper.c
2010-03-20  Junio C HamanoMerge branch 'jk/maint-add-ignored-dir'
2010-03-20  Junio C HamanoMerge branch 'ml/color-grep'
2010-03-20  Junio C HamanoMerge branch 'jc/color-attrs'
2010-03-20  Junio C HamanoMerge branch 'cc/reset-keep'
2010-03-20  Junio C HamanoMerge branch 'fl/askpass'
2010-03-20  Junio C HamanoMerge branch 'bg/apply-fix-blank-at-eof'
2010-03-20  Junio C HamanoMerge branch 'bw/union-merge-refactor'
2010-03-15  Junio C HamanoMerge branch 'sd/format-patch-to'
2010-03-15  Junio C HamanoMerge branch 'tc/http-cleanup'
2010-03-15  Junio C HamanoMerge branch 'tc/transport-verbosity'
2010-03-15  Junio C HamanoMerge branch 'ld/push-porcelain'
2010-03-15  Junio C HamanoMerge branch 'jh/notes'
2010-03-10  Junio C HamanoMerge branch 'sd/init-template'
2010-03-10  Junio C HamanoMerge branch 'sh/am-keep-cr'
2010-03-10  Junio C HamanoMerge branch 'cp/add-u-pathspec'
2010-03-10  Junio C HamanoMerge branch 'lt/deepen-builtin-source'
2010-03-08  Junio C HamanoMerge branch 'mw/maint-gcc-warns-unused-write' into...
2010-03-08  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08  Junio C HamanoMerge branch 'gb/maint-submodule-env' into maint
2010-03-08  Junio C HamanoMerge branch 'as/maint-expire' into maint
2010-03-08  Junio C HamanoMerge branch 'ml/maint-grep-doc' into maint
2010-03-08  Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-08  Junio C HamanoMerge branch 'jc/fetch-param' into maint
2010-03-08  Junio C HamanoMerge branch 'ne/pack-local-doc' into maint
2010-03-08  Junio C HamanoMerge branch 'jk/maint-add--interactive-delete' into...
2010-03-08  Junio C HamanoMerge branch 'mm/mkstemps-mode-for-packfiles' into...
2010-03-08  Junio C HamanoMerge branch 'jc/grep-author-all-match-implicit' into...
2010-03-08  Junio C HamanoMerge branch 'jc/checkout-detached' into maint
2010-03-07  Junio C HamanoMerge branch 'jc/maint-fix-test-perm' into maint-1.6.6
2010-03-07  Junio C HamanoMerge branch 'sp/maint-push-sideband' into maint-1.6.6
2010-03-07  Junio C HamanoMerge branch 'hm/maint-imap-send-crlf' into maint-1.6.6
2010-03-07  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07  Junio C HamanoMerge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07  Junio C HamanoMerge branch 'rs/optim-text-wrap' into maint-1.6.6
2010-03-07  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07  Junio C HamanoMerge branch 'cc/maint-bisect-paths' into maint-1.6.6
2010-03-07  Junio C HamanoMerge branch 'mw/maint-gcc-warns-unused-write'
2010-03-07  Junio C HamanoMerge branch 'as/maint-expire'
2010-03-07  Junio C HamanoMerge branch 'ml/maint-grep-doc'
2010-03-07  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat'
2010-03-07  Junio C HamanoMerge branch 'gb/maint-submodule-env'
2010-03-07  Junio C HamanoMerge branch 'ne/pack-local-doc'
2010-03-07  Junio C HamanoMerge branch 'mb/shortlog-nongit-stdin'
2010-03-07  Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote'
2010-03-07  Junio C HamanoMerge branch 'jc/fetch-param'
2010-03-07  Junio C HamanoMerge branch 'il/loosen-remote-helper-names'
2010-03-07  Junio C HamanoMerge branch 'nd/root-git'
2010-03-07  Junio C HamanoMerge branch 'js/runtime-prefix-trace-not-warn'
2010-03-07  Junio C HamanoMerge branch 'mm/mkstemps-mode-for-packfiles'
2010-03-07  Junio C HamanoMerge branch 'jk/maint-add--interactive-delete'
2010-03-05  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05  Junio C HamanoMerge branch 'rs/optim-text-wrap' into maint
2010-03-05  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-05  Junio C HamanoMerge branch 'cc/maint-bisect-paths' into maint
2010-03-05  Junio C HamanoMerge branch 'maint-1.6.5' into maint-1.6.6
2010-03-03  Junio C HamanoMerge branch 'hm/maint-imap-send-crlf' into maint
2010-03-03  Junio C HamanoMerge branch 'sp/maint-push-sideband' into maint
2010-03-03  Junio C HamanoMerge branch 'jc/maint-fix-test-perm' into maint
2010-03-02  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list'
2010-03-02  Junio C HamanoMerge branch 'rs/optim-text-wrap'
2010-03-02  Junio C HamanoMerge branch 'jn/makedepend'
2010-03-02  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok'
2010-03-02  Junio C HamanoMerge branch 'jc/grep-author-all-match-implicit'
2010-03-01  Junio C HamanoMerge branch 'cc/maint-bisect-paths'
2010-02-22  Matthieu MoyUse git_mkstemp_mode and xmkstemp_mode in odb_mkstemp...
2010-02-22  Matthieu Moygit_mkstemp_mode, xmkstemp_mode: variants of gitmkstemp...
2010-02-21  Junio C HamanoMerge branch 'hm/maint-imap-send-crlf'
2010-02-21  Junio C HamanoMerge branch 'jc/checkout-detached'
2010-02-21  Junio C HamanoMerge branch 'jc/maint-fix-test-perm'
2010-02-21  Junio C HamanoMerge branch 'mv/request-pull-modernize'
2010-02-19  Junio C HamanoMerge branch 'jk/maint-rmdir-fix' into maint
2010-02-16  Junio C HamanoMerge branch 'maint-1.6.5' into maint-1.6.6
2010-02-10  Junio C HamanoMerge branch 'maint-1.6.5' into maint
2010-02-10  Junio C HamanoMerge branch 'sp/maint-fast-import-large-blob' into...
2010-02-10  Junio C HamanoMerge branch 'gp/maint-cvsserver' into maint
2010-02-10  Junio C HamanoMerge branch 'jc/maint-reflog-bad-timestamp' into maint
2010-02-10  Junio C HamanoMerge branch 'il/maint-xmallocz' into maint
2010-02-10  Junio C HamanoMerge branch 'jh/maint-config-file-prefix' into maint
2010-02-10  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-10  Junio C HamanoMerge branch 'sp/maint-push-sideband' into sp/push...
2010-02-09  Junio C HamanoMerge branch 'maint'
2010-02-09  Junio C HamanoMerge branch 'jc/maint-push-doc-status' into maint
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-02-07  Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-07  Junio C HamanoMerge branch 'maint'
2010-02-06  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-02-06  Junio C HamanoMerge branch 'sp/maint-push-sideband' into sp/push...
2010-02-06  Junio C HamanoMerge branch 'maint'
2010-02-03  Junio C HamanoMerge branch 'ms/filter-branch-submodule'
2010-02-03  Junio C HamanoMerge branch 'sp/fast-import-large-blob'
2010-01-31  Junio C HamanoMerge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-30  Junio C HamanoMerge branch 'maint'
2010-01-29  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-28  Junio C HamanoMerge branch 'maint'
2010-01-28  Junio C HamanoMerge branch 'fk/threaded-grep'
2010-01-28  Junio C HamanoMerge branch 'gp/maint-cvsserver'
2010-01-27  Junio C HamanoMerge branch 'jc/upstream-reflog'
2010-01-27  Junio C HamanoMerge branch 'jc/maint-reflog-bad-timestamp'
2010-01-27  Junio C HamanoMerge branch 'il/maint-colon-address'
next