checkout -m path: fix recreating conflicts
[gitweb.git] / t / t9300-fast-import.sh
2008-09-19 Merge branch 'tr/rev-list-reverse'
2008-09-19 Merge branch 'cc/bisect'
2008-09-19 Merge branch 'jc/setlinebuf-setvbuf'
2008-09-16 Merge branch 'maint'
2008-09-16 Merge branch 'dp/maint-rebase-fix'
2008-09-16 Merge branch 'jc/maint-checkout-keep-remove'
2008-09-16 Merge branch 'jc/maint-diff-quiet'
2008-09-16 Merge branch 'jc/maint-name-hash-clear'
2008-09-16 Merge branch 'jc/maint-template-permbits'
2008-09-16 Merge branch 'mh/maint-honor-no-ssl-verify'
2008-09-13 Sync with 1.6.0.2
2008-09-10 Merge branch 'maint'
2008-09-10 t9300, t9301: use "git fast-import/fast-export" without...
2008-09-10 Merge branch 'ho/dashless'
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'
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-05 Merge branch 'jc/maint-log-grep'
2008-09-03 Merge branch '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 'maint'
2008-09-03 Merge branch 'np/maint-safer-pack' into np/pack
2008-08-31 Merge branch 'maint'
2008-08-31 Merge branch 'maint'
2008-08-30 Merge branch 'sp/missing-thin-base' into maint
2008-08-30 Merge branch 'sb/daemon'
2008-08-29 Merge branch 'maint'
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 '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-24 Merge branch 'jc/no-slim-shell'
2008-08-24 Merge branch 'maint' to sync with 1.6.0.1
2008-08-24 Merge branch 'maint'
2008-08-21 Merge branch 'maint'
2008-08-21 Merge branch 'ml/submodule-foreach'
2008-08-21 Merge branch 'pm/log-exit-code'
2008-08-21 Merge branch 'sb/commit-tree-minileak'
2008-08-21 Merge branch 'pb/reflog-dwim'
2008-08-21 Merge branch 'jc/add-stop-at-symlink'
2008-08-21 Merge branch 'kh/diff-tree'
2008-08-21 Merge branch 'mg/count-objects'
2008-08-21 Merge branch 'mz/push-verbose'
2008-08-21 Merge branch 'jc/index-extended-flags'
2008-08-21 Merge branch 'cc/merge-base-many'
2008-08-21 Merge branch 'jc/test-deeper'
2008-08-21 Merge branch 'js/parallel-test'
2008-08-20 Merge branch 'bd/diff-strbuf'
2008-08-20 Merge branch 'dp/hash-literally'
2008-08-20 Merge branch 'js/checkout-dwim-local'
2008-08-20 Merge branch 'ph/enable-threaded'
2008-08-20 Merge branch 'jk/pager-swap'
2008-08-20 Merge branch 'rs/imap'
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge branch 'ak/p4'
2008-08-17 tests: use $TEST_DIRECTORY to refer to the t/ directory
2008-08-17 t9300: replace '!' with test_must_fail
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-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 Support gitlinks in fast-import.
2008-07-17 Merge branch 'mv/dashless'
2008-07-17 Merge branch 'ls/mailinfo'
2008-07-17 Merge branch 'sb/dashless'
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-13 t/: Use "test_must_fail git" instead of "! git"
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-08 Merge branch 'lt/racy-empty' into maint
2008-07-07 Merge branch 'dr/ceiling'
2008-07-06 Merge git://repo.or.cz/git-gui
next