transport-helper: mismerge fix
[gitweb.git] / git-parse-remote.sh
2012-12-23 Merge branch 'jc/doc-diff-blobs' into maint
2012-12-23 Merge branch 'nd/index-format-doc' into maint
2012-12-23 Merge branch 'ta/doc-cleanup' into maint
2012-12-21 Merge branch 'jc/doc-diff-blobs'
2012-12-21 Merge branch 'nd/index-format-doc'
2012-12-18 Merge branch 'jk/pickaxe-textconv' into maint
2012-12-12 Merge branch 'so/prompt-command'
2012-12-11 Merge branch 'ef/mingw-rmdir'
2012-12-07 Merge branch 'jc/same-encoding' into maint
2012-12-07 Merge branch 'lt/diff-stat-show-0-lines' into maint
2012-12-04 Merge branch 'mm/status-push-pull-advise'
2012-12-03 Merge branch 'mm/status-push-pull-advise'
2012-11-29 Merge branch 'lt/diff-stat-show-0-lines'
2012-11-29 Merge branch 'fc/remote-hg'
2012-11-29 Merge branch 'mk/complete-tcsh'
2012-11-29 Merge branch 'jk/send-email-sender-prompt'
2012-11-29 Merge branch 'fc/send-email-no-sender-prompt'
2012-11-29 Merge branch 'jl/submodule-rm'
2012-11-29 Merge branch 'pp/gitweb-config-underscore'
2012-11-29 Merge branch 'fc/completion-test-simplification'
2012-11-28 Merge branch 'mm/status-push-pull-advise'
2012-11-28 Merge branch 'jk/pickaxe-textconv'
2012-11-28 Merge branch 'rh/maint-gitweb-highlight-ext' into maint
2012-11-28 Merge branch 'pw/maint-p4-rcs-expansion-newline' into...
2012-11-27 Merge branch 'nd/maint-compat-fnmatch-fix' into maint
2012-11-27 Merge branch 'jh/update-ref-d-through-symref' into...
2012-11-27 Merge branch 'esr/maint-doc-fast-import' into maint
2012-11-27 Merge branch 'wtk/submodule-doc-fixup' into maint
2012-11-26 Merge branch 'rr/submodule-diff-config'
2012-11-26 Merge branch 'nd/maint-compat-fnmatch-fix'
2012-11-26 Merge branch 'bc/do-not-recurse-in-die'
2012-11-26 Merge branch 'mk/complete-tcsh'
2012-11-26 Merge branch 'jh/update-ref-d-through-symref'
2012-11-26 Merge branch 'lt/diff-stat-show-0-lines'
2012-11-26 Merge branch 'sg/complete-help-undup'
2012-11-26 Merge branch 'jk/checkout-out-of-unborn' into maint
2012-11-26 Merge branch 'cn/config-missing-path' into maint
2012-11-26 Merge branch 'jk/maint-gitweb-xss' into maint
2012-11-21 Merge branch 'esr/maint-doc-fast-import'
2012-11-21 Merge branch 'wtk/submodule-doc-fixup'
2012-11-21 Merge branch 'so/prompt-command'
2012-11-21 Merge branch 'jk/config-ignore-duplicates'
2012-11-21 Merge branch 'jk/maint-http-half-auth-fetch'
2012-11-20 Merge branch 'ml/cygwin-mingw-headers'
2012-11-20 Merge branch 'jk/checkout-out-of-unborn'
2012-11-20 Merge branch 'cn/config-missing-path'
2012-11-20 Merge branch 'jl/submodule-rm'
2012-11-20 Merge branch 'mg/replace-resolve-delete'
2012-11-20 Merge branch 'jk/maint-gitweb-xss'
2012-11-20 Merge branch 'rh/maint-gitweb-highlight-ext'
2012-11-20 Merge branch 'pw/maint-p4-rcs-expansion-newline'
2012-11-20 Merge branch 'mh/alt-odb-string-list-cleanup'
2012-11-20 Merge branch 'ta/doc-cleanup'
2012-11-20 Merge branch 'kb/preload-index-more'
2012-11-20 Merge branch 'jk/maint-http-half-auth-fetch'
2012-11-20 Merge branch 'mg/maint-pull-suggest-upstream-to' into...
2012-11-19 Sync with maint
2012-11-19 Merge branch 'jc/test-say-color-avoid-echo-escape'...
2012-11-15 Merge branch 'jc/prettier-pretty-note'
2012-11-15 Merge branch 'mg/maint-pull-suggest-upstream-to'
2012-11-15 Merge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09 Merge branch 'nd/tree-walk-enum-cleanup'
2012-11-08 push/pull: adjust missing upstream help text to changed...
2012-10-25 Merge branch 'jc/test-say-color-avoid-echo-escape'
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17 Merge branch 'jc/maint-t1450-fsck-order-fix' into maint
2012-10-17 Merge branch 'jc/ll-merge-binary-ours' into maint
2012-10-08 Merge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08 Merge branch 'jc/merge-bases-paint-fix'
2012-10-08 Merge branch 'os/commit-submodule-ignore' into maint
2012-10-08 Merge branch 'lt/mailinfo-handle-attachment-more-sanely...
2012-10-03 Merge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-01 Merge branch 'os/commit-submodule-ignore'
2012-09-20 Merge branch 'dg/run-command-child-cleanup' into maint
2012-09-20 Merge branch 'sn/ls-remote-get-url-doc' into maint
2012-09-18 Merge branch 'er/doc-fast-import-done' into maint
2012-09-15 Merge branch 'jc/ll-merge-binary-ours'
2012-09-15 Merge branch 'dg/run-command-child-cleanup'
2012-09-15 Merge branch 'sb/send-email-reconfirm-fix' into maint
2012-09-15 Merge branch 'jc/send-email-reconfirm' into maint
2012-09-15 Merge branch 'rj/test-regex' into maint-1.7.11
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-14 Merge branch 'sn/ls-remote-get-url-doc'
2012-09-12 Merge branch 'sb/send-email-reconfirm-fix'
2012-09-12 Merge branch 'jc/apply-binary-p0' into maint-1.7.11
2012-09-12 Merge branch 'jc/maint-doc-checkout-b-always-takes...
2012-09-12 Merge branch 'kk/maint-for-each-ref-multi-sort' into...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-09-11 Merge branch 'rj/test-regex'
2012-09-11 Merge branch 'jc/merge-bases'
2012-09-11 Merge branch 'ph/stash-rerere' into maint-1.7.11
2012-09-11 Merge branch 'jc/maint-sane-execvp-notdir' into maint...
2012-09-11 Merge branch 'mh/maint-config-doc-proxy-command' into...
2012-09-11 Merge branch 'jk/docs-docbook-monospace-display' into...
2012-09-11 Merge branch 'jc/maint-t7406-rev-parse-max-count-huh...
2012-09-11 Merge branch 'tr/void-diff-setup-done' into maint-1...
2012-09-11 Merge branch 'tr/merge-recursive-flush' into maint...
2012-09-11 Merge branch 'nd/index-errno' into maint-1.7.11
2012-09-11 Merge branch 'pg/maint-apply-remove-unused-variable...
next