Merge branch 'nd/doc-git-index-version' into maint
[gitweb.git] / builtin / merge-tree.c
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-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-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 '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 '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-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 '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'
2015-01-07 Merge branch 'pd/completion-filenames-fix'
2015-01-07 Merge branch 'jk/add-i-read-error'
2015-01-07 Merge branch 'jk/approxidate-avoid-y-d-m-over-future...
2015-01-07 Merge branch 'jc/merge-bases'
2015-01-07 Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'
2015-01-07 Merge branch 'jc/diff-b-m'
2015-01-07 Merge branch 'jc/clone-borrow'
2015-01-07 Merge branch 'jc/checkout-local-track-report'
2014-12-22 Merge branch 'rs/use-strbuf-complete-line'
2014-12-22 Merge branch 'jg/prompt-localize-temporary'
2014-12-22 Merge branch 'jk/commit-date-approxidate'
2014-12-22 Merge branch 'nd/split-index'
2014-12-22 Merge branch 'jk/read-packed-refs-without-path-max'
2014-12-22 Merge branch 'jk/colors'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-12-22 Merge branch 'js/test-hashmap-squelch-gcc'
2014-12-22 Merge branch 'js/fsck-tag-validation'
2014-12-22 Merge branch 'po/doc-assume-unchanged'
2014-12-22 Merge branch 'mg/branch-d-m-f'
2014-12-22 Merge branch 'jk/for-each-reflog-ent-reverse'
2014-12-22 Merge branch 'sv/doc-stripspace'
2014-12-22 Merge branch 'rt/completion-tag'
2014-12-22 Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
2014-12-22 Merge branch 'jk/credential-quit'
2014-12-22 Merge branch 'dm/compat-s-ifmt-for-zos'
2014-12-22 Merge branch 'jc/hook-cleanup'
2014-12-22 Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'
2014-12-22 Merge branch 'rj/t0050-passes'
2014-12-22 Merge branch 'jc/exec-cmd-system-path-leak-fix'
2014-12-22 Merge branch 'mh/find-uniq-abbrev'
2014-12-22 Merge branch 'dw/shell-basename-dashdash-before-strippi...
2014-12-22 Merge branch 'rj/no-xopen-source-for-cygwin'
next