traverse_trees(): handle D/F conflict case sanely
[gitweb.git] / log-tree.h
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 '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-29 Merge branch '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.0' into maint-1.6.1
2009-04-25 Merge branch '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 Merge branch 'mm/maint-add-p-quit'
2009-04-20 Sync with 1.6.2.4
2009-04-18 Merge branch 'lt/pack-object-memuse'
2009-04-18 Merge branch '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 'maint-1.6.0' into maint
2009-04-18 Merge branch 'maint'
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-13 Mark t1301 permission test to depend on POSIXPERM
2009-04-12 Merge branch 'sb/doc-upstream-branch'
2009-04-12 Merge branch 'fg/remote-prune'
2009-04-12 Merge branch 'cc/sha1-bsearch'
2009-04-12 Merge branch 'cc/bisect-filter'
2009-04-12 Merge branch '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.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 'js/maint-1.6.0-exec-path-env' into maint...
2009-04-08 Merge branch 'maint'
2009-04-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-08 Merge branch 'lt/reflog-expire'
2009-04-08 Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08 Merge branch 'ms/http-auth'
2009-04-08 Merge branch 'js/maint-submodule-checkout'
2009-04-08 Merge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-08 Merge branch 'mh/html-path'
2009-04-06 Merge branch 'jc/name-branch'
2009-04-06 Merge branch 'jc/shared-literally'
2009-04-06 Merge branch 'mg/tracked-local-branches'
2009-04-06 Merge branch 'sb/format-patch-patchname'
2009-04-05 Merge branch 'maint-1.6.0' into maint-1.6.1
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 'maint-1.6.0' into maint-1.6.1
2009-04-02 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-28 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-26 Merge branch 'jc/maint-1.6.0-blame-s'
2009-03-26 Merge branch 'js/maint-1.6.0-exec-path-env'
2009-03-24 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-23 format-patch: --attach/inline uses filename instead...
2009-03-23 format-patch: move get_patch_filename() into log-tree
2009-03-22 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-22 Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
2009-03-22 Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-22 Merge branch 'js/maint-1.6.0-path-normalize' into maint...
2009-03-22 Merge branch 'jc/maint-1.6.0-pack-directory' into maint...
2009-03-18 Merge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-18 Merge branch 'tr/maint-1.6.0-send-email-irt'
2009-03-13 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-13 Merge branch 'js/maint-1.6.1-remote-remove-mirror'...
2009-03-13 Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-11 Merge branch 'fg/maint-exclude-bq' into maint
2009-03-11 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-05 Merge branch 'jc/blame'
2009-03-05 Merge branch 'fg/exclude-bq'
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-01 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-28 Merge branch 'maint-1.6.0' into maint
2009-02-28 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-27 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-25 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-12 Merge branch 'maint-1.6.0' into maint
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'maint-1.5.5' into maint-1.5.6
2009-02-11 Merge branch 'maint-1.5.4' into maint-1.5.5
2009-02-11 Merge branch 'js/maint-1.6.0-path-normalize'
2009-02-10 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'js/maint-remote-remove-mirror'
2009-02-06 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'sg/maint-gitdir-in-subdir' into maint
2009-02-06 Merge branch 'lt/maint-wrap-zlib' into maint
2009-02-06 Merge branch 'js/maint-all-implies-HEAD' into maint
2009-02-06 Merge branch 'kc/maint-diff-bwi-fix' into maint
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-03 Merge branch 'maint-1.6.0' into maint
2009-02-01 Merge branch 'ks/maint-mailinfo-folded'
next