merge_trees(): add ancestor label parameter for diff3-style output
[git/git.git] / merge-recursive.c
2010-03-21 Jonathan Niedermerge_trees(): add ancestor label parameter for diff3...
2010-03-21 Jonathan Niederll_merge(): add ancestor label parameter for diff3...
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-20 Junio C HamanoMerge branch 'maint'
2010-03-17 Junio C HamanoMerge branch 'maint'
2010-03-17 Junio C HamanoMerge branch 'maint'
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-14 Junio C HamanoMerge branch 'maint'
2010-03-13 Junio C HamanoMerge branch 'maint'
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 'maint'
2010-03-08 Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-08 Junio C HamanoMerge branch 'jk/maint-add--interactive-delete' into...
2010-03-08 Junio C HamanoMerge branch 'jc/grep-author-all-match-implicit' into...
2010-03-08 Junio C HamanoMerge branch 'maint-1.6.6' 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 '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-07 Junio C HamanoMerge branch 'jc/maint-fix-mailinfo-strip'
2010-03-07 Junio C HamanoSync with 1.7.0.2
2010-03-07 Junio C HamanoMerge branch 'maint'
2010-03-05 Junio C HamanoMerge branch 'maint'
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.6' 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 'maint'
2010-03-03 Junio C HamanoMerge branch 'jh/maint-submodule-status-in-void' (early...
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 'maint'
2010-03-02 Junio C HamanoMerge branch 'jn/maint-fix-pager'
2010-03-02 Junio C HamanoMerge branch 'ml/encode-header-refactor'
2010-03-02 Junio C HamanoMerge branch 'jn/gitweb-config-error-die'
2010-03-02 Junio C HamanoMerge branch 'jc/for-each-ref'
2010-03-02 Junio C HamanoMerge branch 'ld/maint-diff-quiet-w'
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 'ml/send-pack-transport-refactor'
2010-03-02 Junio C HamanoMerge branch 'ml/fill-mm-refactor'
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-26 Junio C HamanoMerge branch 'maint-1.6.6' into maint
2010-02-24 Junio C HamanoMerge branch 'ml/maint-grep-doc' into maint
2010-02-21 Junio C HamanoMerge branch 'ml/maint-grep-doc'
2010-02-21 Junio C HamanoMerge branch 'hm/maint-imap-send-crlf'
2010-02-21 Junio C HamanoMerge branch 'jc/maint-fix-test-perm'
2010-02-19 Junio C HamanoMerge branch 'jk/maint-rmdir-fix' into maint
2010-02-17 Michael Lukashovrefactor duplicated fill_mm() in checkout and merge...
2010-02-16 Junio C HamanoMerge branch 'maint-1.6.6' into maint
2010-02-16 Junio C HamanoMerge branch 'maint-1.6.5' into maint-1.6.6
2010-02-15 Junio C HamanoMerge branch 'maint-1.6.6' into maint
2010-02-12 Junio C HamanoMerge branch 'maint'
2010-02-12 Junio C HamanoMerge branch 'maint'
2010-02-10 Junio C HamanoSync with 1.6.6.2
2010-02-10 Junio C HamanoMerge branch 'maint-1.6.5' into maint
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 'nd/include-termios-for-osol' 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 'rs/maint-archive-match-pathspec' into...
2010-02-10 Junio C HamanoMerge branch 'sp/maint-push-sideband' into sp/push...
next