traverse_trees(): handle D/F conflict case sanely
[gitweb.git] / shell.c
2009-05-18 Merge branch 'js/add-edit'
2009-05-16 Merge branch 'maint-1.6.2' into maint
2009-05-12 Merge branch 'maint-1.6.2' into maint
2009-05-06 Merge branch 'maint'
2009-05-03 Sync with GIT 1.6.2.5
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
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-28 Merge branch 'maint'
2009-04-25 Merge branch 'maint'
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/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 'ac/color-graph'
2009-04-18 Merge branch 'jk/cobdoc'
2009-04-18 Merge branch 'mk/apply-swap'
2009-04-18 Merge branch 'mm/add-p-quit'
2009-04-18 Merge branch 'eb/upload-archive-from-git-shell'
2009-04-11 git-shell: Add 'git-upload-archive' to allowed commands.
2009-04-09 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-02 Merge branch 'jc/maint-1.6.0-blame-s' into maint
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-22 Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-18 Merge branch 'jc/maint-1.6.0-read-tree-overlay'
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-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-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge git://repo.or.cz/git-gui
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-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-09-29 Merge branch 'jc/better-conflict-resolution'
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-19 Merge branch 'jc/diff-prefix'
2008-09-19 Merge branch 'tr/rev-list-reverse'
2008-09-19 Merge branch 'cc/bisect'
2008-09-19 Merge branch 'jc/maint-name-hash-clear' into maint
2008-09-16 Merge branch 'jc/maint-name-hash-clear'
2008-09-12 Merge branch 'ho/maint-dashless' into maint
2008-09-10 Merge branch 'jc/maint-checkout-fix' into maint
2008-09-10 Merge branch 'np/maint-safer-pack' into maint
2008-09-10 Merge branch 'ho/dashless'
2008-09-08 Merge branch 'ar/autospell'
2008-09-08 Merge branch 'jc/cc-ld-dynpath'
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 'nd/worktree' into maint
2008-09-03 Merge branch 'ho/dashless' into maint
2008-09-03 Merge branch 'tr/filter-branch'
2008-09-03 Merge branch 'np/maint-safer-pack'
2008-09-03 Merge branch 'jc/author-nickname'
2008-09-03 Merge branch 'np/maint-safer-pack' into np/pack
2008-08-30 Merge branch 'sp/missing-thin-base' into maint
2008-08-30 Merge branch 'sb/daemon'
2008-08-30 Merge branch 'af/maint-install-no-handlink' into maint
2008-08-30 shell: do not play duplicated definition games to shrin...
2008-08-30 Merge branch 'np/verify-pack' into maint
2008-08-29 Merge branch 'maint'
2008-08-29 make git-shell paranoid about closed stdin/stdout/stderr
2008-08-28 Merge branch 'mv/merge-custom'
2008-08-28 Merge branch 'ml/submodule'
2008-08-27 Merge branch 'am/cherry-pick-rerere'
2008-08-27 Merge branch 'jc/add-addremove'
2008-08-27 Merge branch 'np/verify-pack'
2008-08-27 Merge branch 'da/submodule-sync'
2008-08-27 Merge branch 'maint'
2008-08-27 Merge branch 'af/maint-install-no-handlink'
2008-08-27 Merge branch 'jc/no-slim-shell'
2008-08-27 Merge branch 'maint'
2008-08-26 Revert "Build-in "git-shell""
2008-08-24 Merge branch 'jc/no-slim-shell'
2008-08-20 Build-in "git-shell"
2008-08-20 Merge branch 'ph/enable-threaded'
2008-08-20 shell: do not play duplicated definition games to shrin...
2008-08-17 Merge git-gui 0.11.0
next