apply: register conflicted stages to the index
[gitweb.git] / t / t2023-checkout-m.sh
2011-12-22 Merge branch 'rr/revert-cherry-pick'
2011-12-22 Merge branch 'tr/pty-all'
2011-12-22 Merge branch 'jn/maint-gitweb-utf8-fix'
2011-12-22 Merge branch 'jk/maint-strbuf-missing-init'
2011-12-22 Merge branch 'jc/maint-lf-to-crlf-keep-crlf'
2011-12-22 Merge branch 'rs/diff-tree-combined-clean-up'
2011-12-22 Merge branch 'jk/maint-push-v-is-verbose'
2011-12-22 Merge branch 'tr/grep-threading'
2011-12-22 Merge branch 'jk/pretty-reglog-ent'
2011-12-22 Merge branch 'jk/follow-rename-score'
2011-12-22 Merge branch 'jk/doc-fsck'
2011-12-22 Merge branch 'nd/war-on-nul-in-commit'
2011-12-22 Merge branch 'jk/maint-do-not-feed-stdin-to-tests'
2011-12-22 Merge branch 'jn/test-cleanup-7006'
2011-12-22 Merge branch 'ef/setenv-putenv'
2011-12-22 Merge branch 'jk/git-prompt'
2011-12-22 Merge branch 'jk/http-push-to-empty'
2011-12-21 Sync with v1.7.8.1
2011-12-21 Merge branch 'maint'
2011-12-20 Merge branch 'mh/ref-api'
2011-12-20 Merge branch 'jc/advice-doc'
2011-12-20 Merge branch 'jc/request-pull-show-head-4'
2011-12-20 Merge branch 'jc/pull-signed-tag'
2011-12-20 Merge branch 'jc/checkout-m-twoway'
2011-12-20 t/t2023-checkout-m.sh: fix use of test_must_fail
2011-12-20 Merge branch 'tr/cache-tree'
2011-12-20 Merge branch 'ab/enable-i18n'
2011-12-20 Merge branch 'ew/keepalive'
2011-12-20 Merge branch 'jc/checkout-m-twoway'
2011-12-12 Test 'checkout -m -- path'