wt-status.c: set commitable bit if there is a meaningful merge.
[gitweb.git] / t / t2023-checkout-m.sh
2012-02-01 Merge branch 'da/maint-mergetool-twoway'
2012-02-01 Merge branch 'jl/submodule-re-add'
2012-02-01 Merge branch 'ks/sort-wildcard-in-makefile'
2012-02-01 Merge branch 'jc/advise-i18n'
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2012-01-29 Merge branch 'sp/smart-http-failure-to-push'
2012-01-29 Merge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29 Merge branch 'tr/maint-mailinfo'
2012-01-29 Merge branch 'nd/maint-refname-in-hierarchy-check'
2012-01-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18 Merge branch 'maint-1.7.7' into maint
2012-01-18 Merge branch 'jk/credentials'
2012-01-18 Merge branch 'mh/maint-show-ref-doc'
2012-01-18 Merge branch 'tr/maint-word-diff-incomplete-line'
2012-01-13 Merge branch 'jc/request-pull-show-head-4'
2012-01-13 Merge branch 'tr/maint-mailinfo'
2012-01-13 Merge branch 'jk/maint-upload-archive'
2012-01-13 Merge branch 'maint-1.7.7' into maint
2012-01-12 Merge branch 'maint-1.7.7' into maint
2012-01-10 Merge the attributes fix in from maint-1.6.7 branch
2012-01-09 Merge branch 'jk/credentials'
2012-01-09 Merge branch 'mh/ref-api-less-extra-refs'
2012-01-09 Merge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-06 Merge branch 'jc/show-sig'
2012-01-06 Merge branch 'jn/maint-gitweb-utf8-fix' into maint
2012-01-06 Merge branch 'maint-1.7.7' into maint
2012-01-04 Merge branch 'nd/maint-parse-depth' into maint
2012-01-03 Merge branch 'pw/p4-docs-and-tests'
2012-01-03 Merge branch 'maint-1.7.7' into maint
2011-12-28 Merge branch 'jv/maint-config-set' into maint
2011-12-28 Merge branch 'jk/follow-rename-score' into maint
2011-12-28 Merge branch 'jc/checkout-m-twoway' into maint
2011-12-22 Merge branch 'tr/doc-sh-setup'
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'