merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t4036-format-patch-signer-mime.sh
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/shared-literally'
2009-04-05 Merge branch 'maint'
2009-04-02 Sync with 1.6.2.2
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 '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'
2009-03-28 Merge branch 'maint'
2009-03-28 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-28 Merge branch 'js/remote-improvements'
2009-03-28 Merge branch 'jk/clone-post-checkout'
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 Sync with maint
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-14 test-suite: Make test script numbers unique