traverse_trees(): handle D/F conflict case sanely
[gitweb.git] / builtin-apply.c
2009-05-16 Merge branch 'maint-1.6.2' into maint
2009-05-14 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-12 Merge branch 'maint-1.6.2' into maint
2009-05-12 Merge branch 'jc/maint-read-tree-multi' into maint...
2009-05-09 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-05-09 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-06 Merge branch 'maint'
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 Sync with GIT 1.6.2.5
2009-05-03 Merge branch 'np/maint-no-ofs-delta' into maint
2009-05-03 Merge branch 'maint-1.6.1' into maint
2009-05-03 Merge branch 'jc/maint-read-tree-multi' into maint
2009-05-03 Merge branch 'mk/maint-apply-swap' into maint
2009-05-03 Merge branch 'mm/maint-add-p-quit' into maint
2009-05-03 Merge branch 'lt/pack-object-memuse' into maint
2009-05-03 Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-03 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-30 replace direct calls to unlink(2) with unlink_or_warn
2009-04-29 Merge branch 'maint'
2009-04-29 Merge branch 'maint-1.6.1' into maint
2009-04-29 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-28 Merge branch 'maint'
2009-04-28 Merge branch 'maint-1.6.1' into maint
2009-04-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-25 Merge branch 'maint'
2009-04-25 Merge branch 'maint-1.6.1' into maint
2009-04-25 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-23 Merge branch 'jc/maint-read-tree-multi'
2009-04-21 Merge branch 'mk/maint-apply-swap'
2009-04-21 Merge branch 'maint'
2009-04-20 builtin-apply: keep information about files to be deleted
2009-04-20 Merge branch 'mm/maint-add-p-quit'
2009-04-20 Sync with 1.6.2.4
2009-04-19 Merge branch 'ef/maint-fast-export' into maint
2009-04-19 Merge branch 'mm/maint-add-p-quit' into maint
2009-04-19 Merge branch 'lt/maint-reflog-expire' into maint
2009-04-19 Merge branch 'jc/maint-shared-literally' into maint
2009-04-18 Merge branch 'lt/bool-on-off'
2009-04-18 Merge branch 'lt/pack-object-memuse'
2009-04-18 Merge branch 'nd/archive-attribute'
2009-04-18 Merge branch 'maint'
2009-04-18 Merge branch 'maint-1.6.1' into maint
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1
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 'ac/color-graph'
2009-04-18 Merge branch 'jk/cobdoc'
2009-04-18 Merge branch 'mk/apply-swap'
2009-04-18 Merge branch 'maint'
2009-04-18 Merge branch 'maint-1.6.1' into maint
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-16 git-apply: fix option description
2009-04-16 builtin-apply: keep information about files to be deleted
2009-04-13 Mark t1301 permission test to depend on POSIXPERM
2009-04-12 Merge branch 'maint'
2009-04-12 Merge branch 'maint-1.6.1' into maint
2009-04-12 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Merge branch 'maint'
2009-04-09 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Merge branch 'maint-1.6.1' into maint
2009-04-09 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Merge branch 'jc/maint-1.6.0-keep-pack' into maint
2009-04-09 Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-09 Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-09 Merge branch 'js/maint-1.6.0-exec-path-env' into maint...
2009-04-08 Merge branch 'maint'
2009-04-08 Merge branch 'maint-1.6.1' into maint
2009-04-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-08 Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08 Merge branch 'js/maint-submodule-checkout'
2009-04-08 Merge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-06 Merge branch 'jc/name-branch'
2009-04-06 Merge branch 'jc/shared-literally'
2009-04-06 Merge branch 'sb/format-patch-patchname'
2009-04-05 Merge branch 'maint'
2009-04-05 Merge branch 'maint-1.6.1' into maint
2009-04-05 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Sync with 1.6.2.2
2009-04-02 Merge branch 'jc/maint-1.6.0-blame-s' into maint
2009-04-02 Merge branch 'js/maint-1.6.0-exec-path-env' into maint
2009-04-02 Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-02 Merge branch 'tr/maint-1.6.1-doc-format-patch--root...
2009-04-02 Merge branch 'ef/fast-export'
2009-04-02 Merge branch 'tr/maint-1.6.1-doc-format-patch--root'
2009-04-02 Merge branch 'maint'
2009-04-02 Merge branch 'maint-1.6.1' into maint
2009-04-02 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-04-02 Merge branch 'kb/tracking-count-no-merges'
2009-03-30 Merge branch 'maint'
2009-03-30 Merge branch 'maint-1.6.1' into maint
2009-03-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-30 Merge branch 'maint'
next