traverse_trees(): handle D/F conflict case sanely
[gitweb.git] / builtin-archive.c
2009-03-27 Merge branch 'db/push-cleanup'
2009-03-26 Merge branch 'maint'
2009-03-26 Merge branch 'db/push-cleanup'
2009-03-26 Merge branch 'jc/maint-1.6.0-blame-s'
2009-03-26 Merge branch 'mg/http-auth'
2009-03-26 Merge branch 'jc/attributes-checkout'
2009-03-26 Merge branch 'js/maint-diff-temp-smudge'
2009-03-26 Merge branch 'js/maint-1.6.0-exec-path-env'
2009-03-26 Merge branch 'bc/maint-1.6.1-branch-deleted-was'
2009-03-26 Merge branch 'fg/push-default'
2009-03-26 Merge branch 'dm/maint-docco'
2009-03-25 Merge branch 'maint'
2009-03-22 Merge branch 'maint'
2009-03-22 Merge branch 'dm/maint-docco'
2009-03-22 Merge branch 'mg/test-installed'
2009-03-22 Sync with maint
2009-03-22 Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-20 Merge branch 'maint'
2009-03-20 Merge branch 'mv/parseopt-ls-files'
2009-03-20 Merge branch 'bw/autoconf'
2009-03-20 Merge branch 'xx/db-refspec-vs-js-remote'
2009-03-20 Merge branch 'jc/clone-branch-rebase'
2009-03-20 Merge branch 'js/rebase-i-opt'
2009-03-20 Merge branch 'fc/parseopt-config'
2009-03-18 Merge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-18 Merge branch 'db/maint-missing-origin'
2009-03-18 Merge branch 'js/sideband-stderr'
2009-03-18 Merge branch 'js/rsync-local'
2009-03-18 Merge branch 'rs/color-grep'
2009-03-18 Merge branch 'js/remote-improvements'
2009-03-18 Merge branch 'tr/maint-1.6.0-send-email-irt'
2009-03-18 Merge branch 'kb/checkout-optim'
2009-03-15 Sync with GIT 1.6.2.1
2009-03-13 Merge branch 'maint'
2009-03-11 Merge branch 'maint'
2009-03-11 Merge branch 'mg/maint-submodule-normalize-path'
2009-03-11 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-11 Merge branch 'rs/memmem'
2009-03-11 Merge branch 'tv/rebase-stat'
2009-03-11 Merge branch 'jk/clone-post-checkout'
2009-03-11 Merge branch 'tr/format-patch-thread'
2009-03-11 Merge branch 'el/blame-date'
2009-03-11 Merge branch 'tr/gcov'
2009-03-11 recv_sideband: Bands #2 and #3 always go to stderr
2009-03-08 archive: use parseopt for local-only options
2009-03-05 Merge branch 'jc/blame'
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-01-24 Merge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24 Merge branch 'tr/maint-no-index-fixes' into maint
2009-01-18 Merge branch 'tr/maint-no-index-fixes'
2009-01-14 Merge branch 'cb/maint-unpack-trees-absense'
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Merge branch 'ap/maint-apply-modefix'
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-11-29 Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge branch 'jn/gitweb-customlinks'
2008-11-13 Merge branch 'gb/gitweb-snapshot-pathinfo'
2008-11-13 Merge branch 'jk/diff-convfilter'
2008-11-13 Merge branch 'jk/diff-convfilter-test-fix'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-09 Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Merge branch 'mv/maint-branch-m-symref' into maint
2008-11-09 Merge branch 'rs/blame'
2008-11-05 Merge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05 Merge branch 'mv/maint-branch-m-symref'
2008-11-05 Merge branch 'mv/parseopt-checkout-index'
2008-11-03 Merge branch 'np/index-pack'
2008-11-03 Merge branch 'sh/rebase-i-p'
2008-11-03 Merge branch 'ag/blame-encoding'
2008-11-03 Merge branch 'gb/gitweb-pathinfo'
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Merge branch 'jk/maint-ls-files-other' into maint
2008-11-02 Merge branch 'jc/maint-reset-remove-unmerged-new' into...
2008-11-02 Merge branch 'jc/maint-co-track' into maint
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-26 Merge branch 'maint'
2008-10-26 git-archive: work in bare repos
2008-10-22 Merge branch 'js/maint-fetch-update-head'
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-19 Merge branch 'tr/workflow-doc'
2008-10-18 Merge branch 'pb/commit-where'
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-10-09 Merge branch 'jc/add-ita'
2008-09-29 Merge branch 'maint' into bc/master-diff-hunk-header-fix
2008-09-29 Merge branch 'bc/maint-diff-hunk-header-fix' into maint
2008-09-29 Merge branch 'jc/better-conflict-resolution'
2008-09-29 Merge branch 'mg/maint-remote-fix' into maint
2008-09-25 Merge branch 'mv/merge-recursive'
next