traverse_trees(): handle D/F conflict case sanely
[gitweb.git] / builtin-archive.c
2008-09-25 Merge branch 'jc/alternate-push'
2008-09-25 Merge branch 'am/status'
2008-09-25 Merge branch 'pb/autocorrect-wrapper'
2008-09-25 Merge branch 'mv/commit-tree'
2008-09-25 Merge branch 'jc/apply-include-exclude'
2008-09-25 Merge branch 'jc/safe-c-l-d'
2008-09-25 Merge branch 'ho/dirstat-by-file'
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-19 Merge branch 'maint'
2008-09-19 Merge branch 'jc/diff-prefix'
2008-09-19 Merge branch 'np/pack'
2008-09-19 Merge branch 'tr/rev-list-reverse'
2008-09-19 Merge branch 'cc/bisect'
2008-09-19 Merge branch 'dp/maint-rebase-fix' into maint
2008-09-19 Merge branch 'jc/maint-checkout-keep-remove' into maint
2008-09-19 Merge branch 'jc/maint-diff-quiet' into maint
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint
2008-09-19 Merge branch 'jc/maint-template-permbits' into maint
2008-09-19 Merge branch 'mh/maint-honor-no-ssl-verify' into maint
2008-09-19 Make git archive respect core.autocrlf when creating...
2008-09-16 Merge branch 'jc/maint-name-hash-clear'
2008-09-10 Merge branch 'jc/maint-hide-cr-in-diff-from-less' into...
2008-09-10 Merge branch 'jc/maint-checkout-fix' into maint
2008-09-10 Merge branch 'np/maint-safer-pack' into maint
2008-09-08 Merge branch 'ar/autospell'
2008-09-08 Merge branch 'jc/cc-ld-dynpath'
2008-09-08 Merge branch 'jc/hide-cr-in-diff-from-less'
2008-09-08 Merge branch 'jc/maint-checkout-fix'
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-03 Merge branch 'maint'
2008-09-03 Merge branch 'nd/worktree' into maint
2008-09-03 Merge branch 'ho/dashless' into maint
2008-08-30 Start conforming code to "git subcmd" style
2008-08-20 Merge branch 'ph/enable-threaded'
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Merge branch 'maint'
2008-08-13 Merge branch 'maint'
2008-08-12 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-09 Merge branch 'maint'
2008-08-06 Sync with 1.5.6.5
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge branch 'maint'
2008-08-03 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-26 archive: allow --exec and --remote without equal sign
2008-07-26 archive: move parameter parsing code to archive.c
2008-07-26 archive: add write_archive()
2008-07-25 Merge branch 'maint'
2008-07-24 Merge branch 'maint' into ph/checkout
2008-07-21 Merge branch 'ap/trackinfo' v1.6.0-rc0
2008-07-21 Merge branch 'jc/rerere-auto-more'
2008-07-21 Merge branch 'ns/am-abort'
2008-07-21 Merge branch 'maint'
2008-07-19 Merge branch 'maint'
2008-07-19 archive: remove unused headers
2008-07-19 archive: make zip compression level independent from...
2008-07-17 Merge branch 'mv/dashless'
2008-07-17 Merge branch 'ls/mailinfo'
2008-07-17 Merge branch 'sb/dashless'
2008-07-17 Merge branch 'rs/archive'
2008-07-15 archive: remove extra arguments parsing code
2008-07-15 archive: add baselen member to struct archiver_args
2008-07-15 archive: remove args member from struct archiver
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-13 Make usage strings dash-less
2008-07-06 Merge git://repo.or.cz/git-gui
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-12 Merge git://repo.or.cz/git-gui
2008-03-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-01 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-01 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Merge branch 'bc/reflog-fix' into js/reflog-delete
2008-02-17 Merge git://repo.or.cz/git-gui
2008-02-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-13 Merge git://repo.or.cz/git-gui
2008-02-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-12 Merge branch 'ph/describe-match'
2008-01-24 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-18 Move sha1_file_to_archive into libgit
next