apply: register conflicted stages to the index
[gitweb.git] / t / t5800-remote-helpers.sh
2012-05-07 Merge branch 'nh/empty-rebase'
2012-05-07 Merge branch 'jk/maint-tformat-with-z'
2012-05-07 Merge branch 'th/difftool-diffall'
2012-05-07 Merge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-07 Merge branch 'js/daemon-test-race-fix' into maint
2012-05-07 Merge branch 'jk/maint-config-bogus-section' into maint
2012-05-07 Merge branch 'pw/t5800-import-race-fix' into maint
2012-05-03 Merge branch 'maint'
2012-05-03 Merge branch 'jk/maint-push-progress'
2012-05-03 Merge branch 'nd/columns'
2012-05-02 Merge branch 'tr/xdiff-fast-hash'
2012-05-02 Merge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02 Merge branch 'jc/rerere-train'
2012-05-02 Merge branch 'lp/diffstat-with-graph'
2012-05-02 Merge branch 'zj/mksh-columns-breakage'
2012-05-02 Merge branch 'jk/doc-asciidoc-inline-literal'
2012-05-02 Merge branch 'nd/i18n'
2012-05-02 Merge branch 'mm/simple-push'
2012-05-02 Merge branch 'jc/index-v4'
2012-05-02 Merge branch 'master' of https://github.com/git-l10n...
2012-05-02 Sync with v1.7.10.1
2012-04-30 Merge branch 'ld/git-p4-tags-and-labels'
2012-04-30 Merge branch 'nh/empty-rebase'
2012-04-30 Merge branch 'jk/maint-config-bogus-section'
2012-04-30 Merge branch 'js/daemon-test-race-fix'
2012-04-30 Merge branch 'kk/gitweb-omit-expensive'
2012-04-30 Merge branch 'kk/maint-gitweb-missing-owner'
2012-04-30 Merge branch 'rs/commit-list-append'
2012-04-30 Merge branch 'mm/include-userpath'
2012-04-30 Merge branch 'pw/t5800-import-race-fix'
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Merge branch 'jk/add-p-skip-conflicts' into maint
2012-04-24 git-remote-testgit: fix race when spawning fast-import
2012-04-20 Merge branch 'jb/am-include'
2012-04-16 Merge branch 'jk/add-p-skip-conflicts'
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02 Merge branch 'pt/gitk'
2012-03-26 Merge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Merge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-03-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-03-05 Merge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-03-01 Merge branch 'jn/maint-gitweb-invalid-regexp'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Merge branch 'sp/smart-http-failure-to-push'
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-21 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20 Merge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-16 Merge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16 Merge branch 'jc/maint-mailmap-output' into maint
2012-02-16 Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-14 Merge branch 'jk/maint-tag-show-fixes' into maint
2012-02-13 Merge branch 'js/add-e-submodule-fix' into maint
2012-02-13 Merge branch 'jc/checkout-out-of-unborn'
2012-02-13 Merge branch 'jc/maint-mailmap-output'
2012-02-13 Merge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13 Merge branch 'jk/maint-tag-show-fixes'
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-02-10 Merge branch 'js/add-e-submodule-fix'
2012-02-06 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06 Merge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06 Sync with 1.7.6.6
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-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
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 'tr/maint-mailinfo'
2012-01-13 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-12 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-10 Merge the attributes fix in from maint-1.6.6 branch
2012-01-09 Merge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-06 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-04 Merge branch 'nd/maint-parse-depth' into maint
2012-01-03 Merge branch 'maint-1.7.6' into maint-1.7.7
2011-12-28 Merge branch 'jv/maint-config-set' into maint
2011-12-28 Merge branch 'jc/checkout-m-twoway' into maint
2011-12-28 Merge branch 'tr/doc-sh-setup' into maint
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28 Merge branch 'jk/maint-push-v-is-verbose' into maint
2011-12-28 Merge branch 'jk/maint-snprintf-va-copy' into maint
2011-12-28 Merge branch 'jk/maint-mv' into maint
2011-12-28 Merge branch 'ew/keepalive' into maint
2011-12-28 Merge branch 'na/strtoimax' into maint
2011-12-22 Merge branch 'tr/doc-sh-setup'
2011-12-22 Merge branch 'tr/pty-all'
2011-12-22 Merge branch 'jk/maint-strbuf-missing-init'
2011-12-22 Merge branch 'jk/maint-push-v-is-verbose'
2011-12-22 Merge branch 'jn/test-cleanup-7006'
2011-12-21 Merge branch 'jl/submodule-status-failure-report' into...
next