merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / line-range.h
2013-11-07 Merge branch 'jc/revision-range-unpeel' into maint
2013-11-04 Merge branch 'vd/doc-unpack-objects'
2013-11-04 Merge branch 'jk/duplicate-objects-in-packs'
2013-11-04 Merge branch 'jk/subtree-install-fix'
2013-11-04 Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
2013-11-04 Merge branch 'sc/doc-howto-dumb-http'
2013-11-04 Merge branch 'jn/test-prereq-perl-doc'
2013-11-01 Merge branch 'sb/refs-code-cleanup'
2013-11-01 Merge branch 'rs/web-browse-xdg-open'
2013-11-01 Merge branch 'js/test-help-format-windows-port-fix'
2013-11-01 Merge branch 'jk/for-each-ref-skip-parsing'
2013-11-01 Merge branch 'ap/remote-hg-unquote-cquote'
2013-10-30 Merge branch 'maint'
2013-10-30 Merge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Merge branch 'jk/date-c-double-semicolon'
2013-10-30 Merge branch 'nd/lift-path-max'
2013-10-30 Merge branch 'tr/valgrind-test-fix'
2013-10-30 Merge branch 'tr/gitk-doc-update'
2013-10-30 Merge branch 'jl/pack-transfer-avoid-double-close'
2013-10-30 Merge branch 'sb/git-svn-docs-indent-with-ht'
2013-10-30 Merge branch 'nd/magic-pathspec'
2013-10-30 Merge branch 'nd/gc-lock-against-each-other'
2013-10-30 Merge branch 'hn/log-graph-color-octopus'
2013-10-30 Merge branch 'mm/checkout-auto-track-fix'
2013-10-30 Merge branch 'sg/t3600-nul-sha1-fix'
2013-10-30 Merge branch 'jc/upload-pack-send-symref'
2013-10-30 Merge branch 'jk/http-auth-redirects'
2013-10-28 Sync with v1.8.4.2
2013-10-28 Merge branch 'sb/repack-in-c'
2013-10-28 Merge branch 'sg/prompt-svn-remote-fix'
2013-10-28 Merge branch 'jk/split-broken-ident'
2013-10-28 Merge branch 'jk/remote-literal-string-leakfix'
2013-10-28 Merge branch 'ew/keepalive'
2013-10-28 Merge branch 'jc/revision-range-unpeel'
2013-10-28 Merge branch 'jx/relative-path-regression-fix'
2013-10-28 Merge branch 'jk/shortlog-tolerate-broken-commit' into...
2013-10-28 Merge branch 'jk/diff-algo' into maint
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 '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 '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 '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 'nd/fetch-pack-error-reporting-fix'
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'
next