archive documentation: attributes are taken from the tree by default
[git] / merge-recursive.h
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 '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-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 'maint'
2010-02-01  Junio C HamanoMerge branch 'sp/maint-fast-import-large-blob' into...
2010-02-01  Junio C HamanoMerge branch 'bg/maint-add-all-doc' into maint-1.6.5
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 'gp/maint-cvsserver'
2010-01-27  Junio C HamanoMerge branch 'jc/maint-reflog-bad-timestamp'
2010-01-27  Junio C HamanoMerge branch 'il/maint-colon-address'
2010-01-27  Junio C HamanoMerge branch 'il/maint-xmallocz'
2010-01-27  Junio C HamanoMerge branch 'jh/maint-config-file-prefix'
2010-01-25  Junio C HamanoMerge branch 'jc/fix-tree-walk'
2010-01-24  Junio C HamanoMerge branch 'maint'
2010-01-24  Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-24  Junio C HamanoMerge branch 'doc-style/for-next' of git://repo.or...
2010-01-23  Junio C HamanoMerge branch 'maint'
2010-01-23  Junio C HamanoMerge branch 'jc/branch-d'
2010-01-23  Junio C HamanoMerge branch 'il/rev-glob'
2010-01-23  Junio C HamanoMerge branch 'js/refer-upstream'
2010-01-23  Junio C HamanoMerge branch 'jl/submodule-diff'
2010-01-23  Junio C HamanoMerge branch 'il/remote-updates'
2010-01-23  Junio C HamanoMerge branch 'il/branch-set-upstream'
2010-01-23  Junio C HamanoMerge branch 'jc/maint-limit-note-output'
2010-01-23  Junio C HamanoMerge branch 'nd/ls-files-sparse-fix'
2010-01-22  Junio C HamanoMerge branch 'maint'
2010-01-21  Junio C HamanoMerge branch 'bw/cvsimport'
2010-01-21  Junio C HamanoMerge branch 'jc/checkout-merge-base'
2010-01-21  Junio C HamanoMerge branch 'ag/patch-header-verify'
2010-01-21  Junio C HamanoMerge branch 'jc/conflict-marker-size'
2010-01-21  Junio C HamanoMerge branch 'ag/maint-apply-too-large-p'
2010-01-21  Junio C HamanoMerge branch 'ap/merge-backend-opts'
2010-01-20  Junio C HamanoMerge branch 'bg/maint-remote-update-default' into...
2010-01-20  Junio C HamanoMerge branch 'bg/maint-add-all-doc' into maint
2010-01-20  Junio C HamanoMerge branch 'jk/maint-1.6.5-reset-hard' into maint...
2010-01-19  Junio C HamanoMerge branch 'maint-1.6.4' into maint-1.6.5
2010-01-18  Junio C HamanoMake "subtree" part more orthogonal to the rest of...
2010-01-18  Avery Pennarungit merge -X<option>
2010-01-17  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-13  Junio C HamanoMerge branch 'jc/checkout-merge-base'
2010-01-13  Junio C HamanoMerge branch 'nd/sparse'
2010-01-12  Junio C HamanoMerge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10  Junio C HamanoMerge branch 'tr/http-updates'
2010-01-10  Junio C HamanoMerge branch 'jk/maint-1.6.5-reset-hard'
2010-01-10  Junio C HamanoMerge branch 'bg/maint-remote-update-default'
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
2010-01-07  Junio C HamanoMerge branch 'bg/maint-add-all-doc'
2010-01-07  Junio C HamanoMerge branch 'mo/bin-wrappers'
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-28  Junio C HamanoMerge branch 'jk/1.7.0-status'
2009-12-27  Junio C HamanoMerge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-26  Junio C HamanoMerge branch 'gb/1.7.0-diff-whitespace-only-output'
2009-12-26  Junio C HamanoMerge branch 'jc/1.7.0-diff-whitespace-only-status'
2009-12-26  Junio C HamanoMerge branch 'jc/1.7.0-push-safety'
2009-12-26  Junio C HamanoMerge branch 'jc/1.7.0-send-email-no-thread-default'
2009-12-26  Junio C HamanoMerge branch 'sr/vcs-helper'
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-09  Junio C HamanoMerge branch 'mm/maint-merge-ff-error-message-fix'...
2009-12-07  Junio C HamanoMerge branch 'master' into il/vcs-helper
2009-12-05  Junio C HamanoSync with 1.6.5.5
2009-12-03  Junio C HamanoMerge branch 'maint'
2009-12-03  Junio C HamanoMerge branch 'jc/maint-am-keep' into maint
2009-12-03  Junio C HamanoMerge in 1.6.5.4
2009-12-03  Junio C HamanoMerge branch 'maint'
2009-12-02  Junio C HamanoMerge branch 'maint'
2009-12-01  Junio C HamanoMerge branch 'maint'
2009-12-01  Junio C HamanoMerge branch 'jc/deprecate-old-syntax-from-merge'
2009-12-01  Junio C HamanoMerge branch 'bw/remote-get-ref-states-fix'
2009-12-01  Junio C HamanoMerge branch 'jn/gitweb-blame'
2009-11-30  Junio C HamanoMerge branch 'fc/maint-format-patch-pathspec-dashes'
2009-11-30  Junio C HamanoMerge branch 'mm/maint-merge-ff-error-message-fix'
2009-11-30  Junio C HamanoMerge branch 'jc/maint-am-keep'
2009-11-30  Matthieu Moymerge-recursive: make the error-message generation...
2009-10-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-09-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
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-08-28  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-08-16  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-08  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-07-02  Junio C HamanoMerge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-06-22  Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-21  Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21  Junio C HamanoMerge branch 'sb/maint-1.6.0-add-config-fix'
next