merge-recursive: Fix modify/delete resolution in the recursive case
[gitweb.git] / Documentation / git-pack-refs.txt
2011-03-15 Merge branch 'jk/strbuf-vaddf'
2011-03-15 Merge branch 'mm/push-default-advice'
2011-03-15 Merge branch 'jn/maint-instaweb-plack-fix'
2011-03-15 Merge branch 'sp/maint-fd-limit'
2011-03-15 Merge branch 'jc/checkout-orphan-warning'
2011-03-15 Merge branch 'jh/maint-do-not-track-non-branches'
2011-03-15 Merge branch 'fk/maint-cvsimport-early-failure'
2011-03-15 Merge branch 'jc/maint-apply-report-offset'
2011-03-15 Merge branch 'jc/maint-apply-no-double-patch'
2011-03-15 Merge branch 'mr/hpux'
2011-03-15 Merge branch 'jk/doc-credits' of git://github.com/peff/git
2011-03-11 doc: drop author/documentation sections from most pages
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-09-15 Merge git://repo.or.cz/git-gui
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-10 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-10-27 Merge git://repo.or.cz/git-gui
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-28 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-08 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-06-22 Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-21 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-14 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-05-26 Merge branch 'js/maint-no-ln-across-libexec-and-bin...
2009-05-26 Merge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26 Merge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-24 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-23 Merge branch 'mg/track'
2009-05-23 Merge branch 'js/maint-no-ln-across-libexec-and-bin'
2009-05-23 Merge branch 'lt/maint-diff-reduce-lstat'
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv'
2009-05-14 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-09 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-06 Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
2009-05-06 Merge branch 'maint-1.6.0' into maint
2009-05-03 Merge branch 'maint-1.6.1' into maint
2009-05-03 Merge branch 'lt/pack-object-memuse' into maint
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29 Merge branch 'maint-1.6.1' into maint
2009-04-28 Merge branch 'maint-1.6.1' into maint
2009-04-25 Merge branch 'maint-1.6.1' into maint
2009-04-19 Merge branch 'jc/maint-shared-literally' into maint
2009-04-18 Merge branch 'lt/pack-object-memuse'
2009-04-18 Merge branch 'maint-1.6.1' into maint
2009-04-18 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-04-18 Merge branch 'js/maint-submodule-checkout' into maint
2009-04-18 Merge branch 'cb/maint-merge-recursive-submodule-fix...
2009-04-18 Merge branch 'maint-1.6.0' into maint
2009-04-18 Merge branch 'maint-1.6.1' into maint
2009-04-13 Mark t1301 permission test to depend on POSIXPERM
next