transport-helper: mismerge fix
[gitweb.git] / contrib / remote-helpers / test-hg-bidi.sh
2013-10-23 Sync with 'maint'
2013-10-23 Merge branch 'jc/ls-files-killed-optim' into maint
2013-10-23 Merge branch 'jh/checkout-auto-tracking' into maint
2013-10-23 Merge branch 'po/dot-url'
2013-10-23 Merge branch 'hu/cherry-pick-previous-branch'
2013-10-23 Merge branch 'mg/more-textconv'
2013-10-23 Merge branch 'jc/pack-objects'
2013-10-18 Merge branch 'maint'
2013-10-18 Merge branch 'jc/reflog-doc'
2013-10-18 Merge branch 'sb/repack-in-c'
2013-10-18 Merge branch 'jk/clone-progress-to-stderr'
2013-10-17 Merge branch 'jk/format-patch-from'
2013-10-17 Merge branch 'es/name-hash-no-trailing-slash-in-dirs'
2013-10-17 Merge branch 'jk/trailing-slash-in-pathspec'
2013-10-17 Merge branch 'lc/filter-branch-too-many-refs'
2013-10-17 Merge branch 'jc/checkout-detach-doc'
2013-10-17 Sync with maint
2013-10-17 Merge branch 'jk/upload-pack-keepalive' into maint
2013-10-17 Merge branch 'bc/http-backend-allow-405' into maint
2013-10-17 Merge branch 'jc/cvsserver-perm-bit-fix' into maint
2013-10-17 Merge branch 'nd/git-dir-pointing-at-gitfile' into...
2013-10-17 Merge branch 'es/rebase-i-respect-core-commentchar...
2013-10-15 Merge branch 'maint'
2013-10-14 Merge branch 'rj/highlight-test-hang'
2013-10-14 Merge branch 'nv/doc-config-signingkey'
2013-10-14 Merge branch 'rj/doc-formatting-fix'
2013-10-14 Merge branch 'po/remote-set-head-usage'
2013-10-14 Merge branch 'nd/clone-local-with-colon'
2013-10-14 Merge branch 'jx/clean-interactive'
2013-10-14 Merge branch 'jk/diff-algo'
2013-10-08 Merge branch 'tz/credential-netrc'
2013-09-26 Sync with Git 1.8.4.1
2013-09-26 Merge branch 'mm/rebase-continue-freebsd-WB' into maint
2013-09-26 Merge branch 'km/svn-1.8-serf-only' into maint
2013-09-26 Merge branch 'js/xread-in-full' into maint
2013-09-25 Merge branch 'bc/submodule-status-ignored'
2013-09-25 Merge branch 'cc/replace-with-the-same-type'
2013-09-25 Merge branch 'kb/msvc-compile'
2013-09-25 Merge branch 'nd/unpack-entry-optim-in-pack-objects'
2013-09-25 Merge branch 'jk/shortlog-tolerate-broken-commit'
2013-09-25 Merge branch 'jc/strcasecmp-pure-inline'
2013-09-25 Merge branch 'sg/complete-untracked-filter'
2013-09-25 Merge branch 'nd/fetch-pack-error-reporting-fix'
2013-09-25 Merge branch 'es/contacts-in-subdir'
2013-09-25 Merge branch 'jc/push-cas'
2013-09-25 Merge branch 'maint'
2013-09-20 Merge branch 'jk/upload-pack-keepalive'
2013-09-20 Merge branch 'fc/at-head'
2013-09-20 Merge branch 'dw/check-ignore-sans-index'
2013-09-20 Merge branch 'mm/commit-template-squelch-advice-messages'
2013-09-20 Merge branch 'bk/refs-multi-update'
2013-09-20 Merge branch 'nr/git-cd-to-a-directory'
2013-09-20 Merge branch 'mm/rebase-continue-freebsd-WB'
2013-09-20 Merge branch 'jh/checkout-auto-tracking'
2013-09-20 Merge branch 'bc/http-backend-allow-405'
2013-09-20 Merge branch 'np/lookup-object-hashing'
2013-09-20 Merge branch 'hu/cherry-pick-previous-branch'
2013-09-20 Merge branch 'mm/status-without-comment-char'
2013-09-20 Merge branch 'rh/peeling-tag-to-tag'
2013-09-20 Merge branch 'jx/branch-vv-always-compare-with-upstream'
2013-09-20 Merge branch 'nd/fetch-into-shallow'
2013-09-19 Merge branch 'jk/config-int-range-check'
2013-09-18 Merge branch 'maint'
2013-09-18 Merge branch 'jl/some-submodule-config-are-not-boolean...
2013-09-18 Merge branch 'jk/mailmap-incomplete-line' into maint
2013-09-18 Merge branch 'jc/url-match'
2013-09-18 Merge branch 'jc/cvsserver-perm-bit-fix'
2013-09-18 Merge branch 'bc/send-email-ssl-die-message-fix'
2013-09-18 Merge branch 'uh/git-svn-serf-fix'
2013-09-18 Merge branch 'fc/contrib-bzr-hg-fixes'
2013-09-18 Merge branch 'jk/duplicate-objects-in-packs'
2013-09-18 Merge branch 'nd/git-dir-pointing-at-gitfile'
2013-09-17 Merge branch 'dw/diff-no-index-doc'
2013-09-17 Merge branch 'ab/gitweb-author-initials'
2013-09-17 Merge branch 'jk/write-broken-index-with-nul-sha1'
2013-09-17 Merge branch 'jx/clean-interactive'
2013-09-17 Merge branch 'jk/free-tree-buffer'
2013-09-12 Merge branch 'jc/pager-configuration-doc'
2013-09-12 Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-12 Merge branch 'mm/fast-import-feature-doc'
2013-09-11 Merge branch 'jc/ls-files-killed-optim'
2013-09-11 Merge branch 'js/xread-in-full'
2013-09-11 Merge branch 'es/rebase-i-respect-core-commentchar'
2013-09-09 Merge branch 'jk/mailmap-incomplete-line'
2013-09-09 Merge branch 'jc/url-match'
2013-09-09 Merge branch 'jk/cat-file-batch-optim'
2013-09-09 Merge branch 'nd/clone-connectivity-shortcut'
2013-09-09 Merge branch 'jc/diff-filter-negation'
2013-09-09 Merge branch 'ms/fetch-prune-configuration'
2013-09-05 Merge branch 'nd/fetch-pack-shallow-fix' into maint
2013-09-05 Merge branch 'hv/config-from-blob' into maint
2013-09-05 Merge branch 'maint-1.8.3' into maint
2013-09-05 Merge branch 'maint-1.8.2' into maint-1.8.3
2013-09-04 Merge branch 'jl/some-submodule-config-are-not-boolean'
2013-09-04 Merge branch 'sb/diff-delta-remove-needless-comparison'
2013-09-04 Merge branch 'nd/gc-lock-against-each-other'
2013-09-04 Merge branch 'tr/fd-gotcha-fixes'
2013-09-04 Merge branch 'bc/unuse-packfile'
2013-09-04 Merge branch 'da/darwin'
2013-09-04 Merge branch 'rr/feed-real-path-to-editor'
next