apply: register conflicted stages to the index
[gitweb.git] / t / t5704-bundle.sh
2012-03-02 Merge branch 'th/git-diffall'
2012-03-01 Merge branch 'maint'
2012-03-01 Merge branch 'nd/maint-verify-objects'
2012-03-01 Merge branch 'jn/maint-gitweb-invalid-regexp'
2012-03-01 Merge branch 'cn/maint-rev-list-doc'
2012-03-01 Merge branch 'cn/maint-branch-with-bad'
2012-02-28 Merge branch 'pj/completion-remote-set-url-branches'
2012-02-28 Merge branch 'ph/cherry-pick-advice-refinement'
2012-02-28 Merge branch 'jb/required-filter'
2012-02-28 Merge branch 'master' into git-po
2012-02-27 Merge branch 'maint'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Merge branch 'jn/ancient-meld-support' into maint
2012-02-27 Merge branch 'jn/gitweb-search-optim'
2012-02-27 Merge branch 'tr/maint-bundle-long-subject'
2012-02-27 Merge branch 'sp/smart-http-failure-to-push'
2012-02-23 t5704: match tests to modern style
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-23 bundle: use a strbuf to scan the log for boundary commits
2012-02-21 Merge branch 'jk/git-dir-lookup' into maint
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/git-dir-lookup'
2012-02-14 Merge branch 'jn/ancient-meld-support'
2012-02-14 Merge branch 'jk/maint-tag-show-fixes' into maint
2012-02-14 Merge branch 'bw/inet-pton-ntop-compat' into maint
2012-02-13 Merge branch 'js/add-e-submodule-fix' into maint
2012-02-13 Merge branch 'jc/parse-date-raw' 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 'bw/inet-pton-ntop-compat'
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-10 Merge branch 'jc/parse-date-raw'
2012-02-10 Merge branch 'tr/grep-l-with-decoration' into maint
2012-02-10 Merge branch 'jl/submodule-re-add' into maint
2012-02-10 Merge branch 'da/maint-mergetool-twoway' into maint
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-02-01 Merge branch 'jc/pull-signed-tag'
2012-02-01 Merge branch 'ar/i18n-no-gettext'
2012-02-01 Merge branch 'da/maint-mergetool-twoway'
2012-02-01 Merge branch 'jl/submodule-re-add'
2012-02-01 Merge branch 'tr/grep-l-with-decoration'
2012-02-01 Merge branch 'ks/sort-wildcard-in-makefile'
2012-02-01 Merge branch 'rr/sequencer'
2012-02-01 Merge branch 'jc/advise-i18n'
2012-01-29 Merge branch 'nd/index-pack-no-recurse'
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 'jl/test-pause'
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 branch 'bw/maint-t8006-sed-incomplete-line'
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 'jm/stash-diff-disambiguate'
2012-01-06 Merge branch 'jh/fetch-head-update'
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'
2012-01-03 Merge branch 'maint-1.7.7' into maint
2012-01-03 fix hang in git fetch if pointed at a 0 length bundle
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
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 'ms/commit-cc-option-helpstring' into...
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 '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-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
next