ll-merge: use a longer conflict marker for internal merge
[gitweb.git] / fetch-pack.c
2015-05-11 Merge branch 'jc/diff-no-index-d-f' into maint-2.3
2015-05-11 Merge branch 'oh/fix-config-default-user-name-section...
2015-05-11 Merge branch 'jc/epochtime-wo-tz' into maint-2.3
2015-04-27 Merge branch 'tb/connect-ipv6-parse-fix' into maint
2015-04-27 Merge branch 'ma/bash-completion-leaking-x' into maint
2015-04-27 Merge branch 'jc/push-cert' into maint
2015-04-21 Merge branch 'jk/colors' into maint
2015-04-21 Merge branch 'jk/test-annoyances' into maint
2015-04-21 Merge branch 'pt/enter-repo-comment-fix' into maint
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21 Merge branch 'jk/cherry-pick-docfix' into maint
2015-04-21 Merge branch 'iu/fix-parse-options-h-comment' into...
2015-04-21 Merge branch 'jg/cguide-we-cannot-count' into maint
2015-04-21 Merge branch 'jk/pack-corruption-post-mortem' into...
2015-04-21 Merge branch 'jn/doc-fast-import-no-16-octopus-limit...
2015-03-31 Merge branch 'ss/pull-rebase-preserve' into maint
2015-03-31 Merge branch 'jc/report-path-error-to-dir' into maint
2015-03-31 Merge branch 'ph/push-doc-cas' into maint
2015-03-28 Merge branch 'sg/completion-gitcomp-nl-for-refs' into...
2015-03-28 Merge branch 'jk/simplify-csum-file-sha1fd-check' into...
2015-03-28 Merge branch 'tg/test-index-v4' into maint
2015-03-28 Merge branch 'nd/doc-git-index-version' into maint
2015-03-28 Merge branch 'ct/prompt-untracked-fix' into maint
2015-03-28 Merge branch 'ws/grep-quiet-no-pager' into maint
2015-03-28 Merge branch 'jc/submitting-patches-mention-send-email...
2015-03-28 Merge branch 'jk/cleanup-failed-clone' into maint
2015-03-28 Merge branch 'jk/fetch-pack' into maint
2015-03-27 Merge branch 'jk/tag-h-column-is-a-listing-option'...
2015-03-27 Merge branch 'jk/smart-http-hide-refs' into maint
2015-03-27 Merge branch 'js/completion-ctags-pattern-substitution...
2015-03-23 Merge branch 'rs/use-isxdigit' into maint
2015-03-23 Merge branch 'rs/deflate-init-cleanup' into maint
2015-03-23 Merge branch 'jc/decorate-leaky-separator-color' into...
2015-03-23 Merge branch 'mg/verify-commit' into maint
2015-03-19 fetch-pack: remove dead assignment to ref->new_sha1
2015-03-19 filter_ref: make a copy of extra "sought" entries
2015-03-19 filter_ref: avoid overwriting ref->old_sha1 with garbage
2015-03-14 Merge branch 'mr/doc-clean-f-f' into maint
2015-03-14 Merge branch 'ak/t5516-typofix' into maint
2015-03-14 Merge branch 'jc/diff-test-updates' into maint
2015-03-14 Merge branch 'jk/diffcore-rename-duplicate' into maint
2015-03-14 Merge branch 'bw/kwset-use-unsigned' into maint
2015-03-14 Merge branch 'nd/grep-exclude-standard-help-fix' into...
2015-03-14 Merge branch 'mk/diff-shortstat-dirstat-fix' into maint
2015-03-14 Merge branch 'ms/submodule-update-config-doc' into...
2015-03-14 Merge branch 'jc/apply-beyond-symlink' into maint
2015-03-14 Merge branch 'rs/daemon-interpolate' into maint
2015-03-14 Merge branch 'jk/daemon-interpolate' into maint
2015-03-06 Merge branch 'rj/no-xopen-source-for-cygwin' into maint
2015-03-06 Merge branch 'rs/simple-cleanups' into maint
2015-03-06 Merge branch 'mm/am-c-doc' into maint
2015-03-05 Merge branch 'sb/plug-leak-in-make-cache-entry' into...
2015-03-05 Merge branch 'jk/fast-import-die-nicely-fix' into maint
2015-03-05 Merge branch 'es/blame-commit-info-fix' into maint
2015-03-05 Merge branch 'ab/merge-file-prefix' into maint
2015-03-05 Merge branch 'ps/submodule-sanitize-path-upon-add'...
2015-03-05 Merge branch 'jk/prune-mtime' into maint
2015-03-05 Merge branch 'jc/conf-var-doc' into maint
2015-03-05 Merge branch 'jc/remote-set-url-doc' into maint
2015-03-05 Merge branch 'jk/pack-bitmap' into maint
2015-03-05 Merge branch 'jk/config-no-ungetc-eof' into maint
2015-03-05 Merge branch 'jk/decimal-width-for-uintmax' into maint
2015-03-05 Merge branch 'jc/push-cert' into maint
2015-03-05 Merge branch 'ks/rebase-i-abbrev' into maint
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-03-05 Merge branch 'jk/sanity' into maint
2015-02-25 Merge branch 'ak/add-i-empty-candidates' into maint
2015-02-25 Merge branch 'jc/apply-ws-fix-expands' into maint
2015-02-25 Merge branch 'jc/doc-log-rev-list-options' into maint
2015-02-25 Merge branch 'mg/commit-author-no-match-malformed-messa...
2015-02-25 Merge branch 'jk/dumb-http-idx-fetch-fix' into maint
2015-02-25 Merge branch 'jc/diff-format-doc' into maint
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25 Merge branch 'jk/status-read-branch-name-fix' into...
2015-02-25 Merge branch 'mg/push-repo-option-doc' into maint
2015-02-25 Merge branch 'jn/rerere-fail-on-auto-update-failure...
2015-02-25 Merge branch 'jk/blame-commit-label' into maint
2015-01-21 Merge branch 'jk/http-push-symref-fix'
2015-01-21 Merge branch 'ak/show-branch-usage-string'
2015-01-20 Merge branch 'jk/colors'
2015-01-14 Merge branch 'rc/for-each-ref-tracking'
2015-01-14 Merge branch 'ak/show-branch-usage-string'
2015-01-14 Merge branch 'mm/complete-rebase-autostash'
2015-01-14 Merge branch 'aw/doc-smtp-ssl-cert-path'
2015-01-14 Merge branch 'km/log-usage-string-i18n'
2015-01-14 Merge branch 'jk/prune-packed-server-info'
2015-01-12 Merge branch 'jk/read-packed-refs-without-path-max...
2015-01-12 Merge branch 'mh/find-uniq-abbrev' into maint
2015-01-12 Merge branch 'jk/approxidate-avoid-y-d-m-over-future...
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-12 Merge branch 'jk/for-each-reflog-ent-reverse' into...
2015-01-12 Merge branch 'es/checkout-index-temp'
2015-01-07 Merge branch 'maint-2.1' into maint
2015-01-07 Merge branch 'maint-2.0' into maint-2.1
2015-01-07 Merge branch 'maint-1.9' into maint-2.0
2015-01-07 Merge branch 'maint-1.8.5' into maint-1.9
2015-01-07 Merge branch 'jk/dotgit-case-maint-1.8.5' into maint...
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2015-01-07 Merge branch 'lh/send-email-hide-x-mailer'
2015-01-07 Merge branch 'rd/send-email-2047-fix'
next