apply: register conflicted stages to the index
[gitweb.git] / t / t4013 /
2012-02-21 Merge branch 'jn/gitweb-unborn-head'
2012-02-21 Merge branch 'cb/receive-pack-keep-errors' into maint
2012-02-21 Merge branch 'cb/transfer-no-progress' into maint
2012-02-21 Merge branch 'jk/git-dir-lookup' into maint
2012-02-21 Merge branch 'jc/diff-stat-scaler' into maint
2012-02-21 Merge branch 'zj/term-columns' into maint
2012-02-21 Merge branch 'cb/maint-rev-list-verify-object' into...
2012-02-21 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-21 Merge branch 'dp/i18n-libcharset' into maint
2012-02-21 Merge branch 'jk/grep-binary-attribute' into maint
2012-02-21 Merge branch 'nd/diffstat-gramnum' into maint
2012-02-20 Merge branch 'tg/tag-points-at'
2012-02-20 Merge branch 'jc/diff-stat-scaler'
2012-02-20 Merge branch 'zj/decimal-width'
2012-02-20 Merge branch 'zj/term-columns'
2012-02-20 Merge branch 'cb/transfer-no-progress'
2012-02-20 Merge branch 'cb/receive-pack-keep-errors'
2012-02-20 Merge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-20 Merge branch 'cb/maint-rev-list-verify-object'
2012-02-20 Merge branch 'maint'
2012-02-16 Sync with maint
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-14 Merge branch 'jk/git-dir-lookup'
2012-02-14 Merge branch 'jk/grep-binary-attribute'
2012-02-14 Merge branch 'nd/pack-objects-parseopt'
2012-02-14 Merge branch 'dp/i18n-libcharset'
2012-02-14 Merge branch 'mh/war-on-extra-refs'
2012-02-14 Merge branch 'lt/pull-no-edit'
2012-02-14 Merge branch 'bl/gitweb-project-filter'
2012-02-14 Merge branch 'jn/ancient-meld-support'
2012-02-14 Merge branch 'jk/userdiff-config-simplify'
2012-02-14 Sync with 1.7.9.1
2012-02-13 Sync with 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 'jk/prompt-fallback-to-tty'
2012-02-13 Merge branch 'jn/gitweb-search-utf-8'
2012-02-13 Merge branch 'nd/diffstat-gramnum'
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-02-04 Use correct grammar in diffstat summary line
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2012-01-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
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-snprintf-va-copy' 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-21 Merge branch 'jl/submodule-status-failure-report' into...
2011-12-21 Merge branch 'tr/userdiff-c-returns-pointer' into maint
2011-12-21 Merge branch 'ms/commit-cc-option-helpstring' into...
2011-12-20 Merge branch 'jc/checkout-m-twoway'
2011-12-20 Merge branch 'jc/checkout-m-twoway'
2011-12-20 Merge branch 'jk/maint-snprintf-va-copy'
2011-12-18 Update jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17 Merge git://ozlabs.org/~paulus/gitk
2011-12-14 Merge branch 'jl/submodule-status-failure-report'
2011-12-14 Merge branch 'tr/userdiff-c-returns-pointer'
2011-12-14 Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
2011-12-14 Merge branch 'jc/maint-name-rev-all' into maint-1.7.6
2011-12-14 Merge branch 'ml/mailmap' into maint-1.7.6
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui
2011-12-05 Merge branch 'nd/maint-ignore-exclude'
2011-11-28 Merge branch 'nd/maint-ignore-exclude' into nd/ignore...
2011-11-23 Merge branch 'maint' into tj/imap-send-remove-unused
2011-11-21 Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18 Merge branch 'jc/maint-name-rev-all' into maint
2011-11-18 Merge branch 'ml/mailmap' into maint
2011-11-18 Merge branch 'jn/maint-notes-avoid-va-args' into maint
2011-11-12 Merge branch 'ly/mktree-using-strbuf'
2011-11-10 Merge "Move 'builtin-*' into a 'builtin/' subdirectory"
2011-11-10 Merge 'build-in git-mktree'
2011-11-09 Merge branch 'jc/remote-setbranches-usage-fix'
2011-11-09 Merge branch 'fc/remote-seturl-usage-fix'
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint
2011-11-08 Merge branch 'ss/blame-textconv-fake-working-tree'
2011-11-01 Merge branch 'md/smtp-tls-hello-again' into maint
2011-11-01 Merge branch 'jk/pull-rebase-with-work-tree' into maint
2011-11-01 Merge branch 'jc/maint-diffstat-numstat-context' into...
2011-11-01 Merge branch 'sp/smart-http-failure' into maint
2011-11-01 Merge branch 'ss/blame-textconv-fake-working-tree'
2011-11-01 Merge branch 'nd/pretty-commit-log-message'
2011-10-26 Merge branch 'ps/gitweb-js-with-lineno' into maint...
2011-10-26 Merge branch 'maint-1.7.4' into maint-1.7.5
2011-10-26 Merge branch 'maint-1.7.3' into maint-1.7.4
2011-10-26 Merge branch 'sn/doc-update-index-assume-unchanged...
2011-10-24 Merge branch 'maint-1.7.3' into maint
2011-10-21 Merge branch 'ss/inet-ntop'
2011-10-21 Merge branch 'jc/maint-remove-renamed-ref'
2011-10-21 Merge branch 'cn/doc-config-bare-subsection'
2011-10-21 Merge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-21 Merge branch 'il/archive-err-signal' into maint
2011-10-21 Merge branch 'js/maint-merge-one-file-osx-expr' into...
2011-10-21 Merge branch 'jm/maint-apply-detects-corrupt-patch...
2011-10-21 Merge branch 'jc/checkout-from-tree-keep-local-changes...
2011-10-21 Merge branch 'mm/maint-config-explicit-bool-display...
2011-10-19 Merge branch 'jm/maint-apply-detects-corrupt-patch...
2011-10-19 Merge branch 'js/log-show-children'
2011-10-19 Merge branch 'cb/httpd-test-fix-port'
next