Merge branch 'tz/complete-branch-copy' into maint
[git/git.git] / git-merge-resolve.sh
2017-12-06 Junio C HamanoMerge branch 'tz/complete-branch-copy' into maint
2017-12-06 Junio C HamanoMerge branch 'sd/branch-copy' into maint
2017-12-06 Junio C HamanoMerge branch 'sw/pull-ipv46-passthru' into maint
2017-11-27 Junio C HamanoMerge branch 'rs/apply-fuzzy-match-fix' into maint
2017-11-27 Junio C HamanoMerge branch 'rs/imap-send-next-arg-fix' into maint
2017-11-21 Junio C HamanoMerge branch 'cb/t4201-robustify' into maint
2017-11-21 Junio C HamanoMerge branch 'ad/rebase-i-serie-typofix' into maint
2017-11-21 Junio C HamanoMerge branch 'ab/pcre-v2' into maint
2017-11-21 Junio C HamanoMerge branch 'bw/rebase-i-ignored-submodule-fix' into...
2017-11-15 Junio C HamanoMerge branch 'dk/libsecret-unlock-to-load-fix' into...
2017-11-15 Junio C HamanoMerge branch 'js/early-config' into maint
2017-11-15 Junio C HamanoMerge branch 'ao/diff-populate-filespec-lstat-errorpath...
2017-11-15 Junio C HamanoMerge branch 'jc/check-ref-format-oor' into maint
2017-11-15 Junio C HamanoMerge branch 'jk/rebase-i-exec-gitdir-fix' into maint
2017-11-15 Junio C HamanoMerge branch 'bw/grep-recurse-submodules' into maint
2017-11-15 Junio C HamanoMerge branch 'js/submodule-in-excluded' into maint
2017-11-15 Junio C HamanoMerge branch 'kd/auto-col-with-pager-fix' into maint
2017-11-15 Junio C HamanoMerge branch 'sg/travis-fixes' into maint
2017-11-09 Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui...
2017-10-28 Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-10-28 Junio C HamanoMerge branch 'sb/rev-parse-show-superproject-root'
2017-10-28 Junio C HamanoMerge branch 'ao/path-use-xmalloc'
2017-10-23 Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-23 Junio C HamanoMerge branch 'ma/ts-cleanups' into maint
2017-10-23 Junio C HamanoMerge branch 'ls/travis-scriptify' into maint
2017-10-23 Junio C HamanoMerge branch 'jt/fast-export-copy-modify-fix' into...
2017-10-23 Junio C HamanoMerge branch 'nd/worktree-kill-parse-ref' into maint
2017-10-19 Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update'
2017-10-18 Junio C HamanoMerge branch 'rs/qsort-s' into maint
2017-10-18 Junio C HamanoMerge branch 'mr/doc-negative-pathspec' into maint
2017-10-18 Junio C HamanoMerge branch 'jk/doc-read-tree-table-asciidoctor-fix...
2017-10-18 Junio C HamanoMerge branch 'kd/doc-for-each-ref' into maint
2017-10-18 Junio C HamanoMerge branch 'cc/subprocess-handshake-missing-capabilit...
2017-10-18 Junio C HamanoMerge branch 'jk/system-path-cleanup' into maint
2017-10-18 Junio C HamanoMerge branch 'bb/doc-eol-dirty' into maint
2017-10-18 Junio C HamanoMerge branch 'mg/timestamp-t-fix' into maint
2017-10-18 Junio C HamanoMerge branch 'ma/pkt-line-leakfix' into maint
2017-10-18 Junio C HamanoMerge branch 'jk/config-lockfile-leak-fix' into maint
2017-10-18 Junio C HamanoMerge branch 'dw/diff-highlight-makefile-fix' into...
2017-10-18 Junio C HamanoMerge branch 'jk/drop-sha1-entry-pos' into maint
2017-10-18 Junio C HamanoMerge branch 'rb/compat-poll-fix' into maint
2017-10-18 Junio C HamanoMerge branch 'ar/request-pull-phrasofix' into maint
2017-10-18 Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix' into maint
2017-10-18 Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix' into maint
2017-10-18 Junio C HamanoMerge branch 'ik/userdiff-html-h-element-fix' into...
2017-10-18 Junio C HamanoMerge branch 'jk/diff-blob' into maint
2017-10-18 Junio C HamanoMerge branch 'jk/describe-omit-some-refs' into maint
2017-10-18 Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-10-18 Junio C HamanoMerge branch 'rs/archive-excluded-directory' into maint
2017-10-18 Junio C HamanoMerge branch 'rk/commit-tree-make-F-verbatim' into...
2017-10-18 Junio C HamanoMerge branch 'mh/packed-ref-store-prep' into maint
2017-10-18 Junio C HamanoMerge branch 'mm/send-email-cc-cruft' into maint
2017-10-18 Junio C HamanoMerge branch 'rs/strbuf-getwholeline-fix' into maint
2017-10-18 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-17 Junio C HamanoMerge branch 'jk/ui-color-always-to-auto-maint' (early...
2017-10-17 Junio C HamanoMerge branch 'sb/diff-color-move'
2017-10-17 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-11 Junio C HamanoMerge branch 'ls/filter-process-delayed'
2017-10-09 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-08 Jiang XinMerge branch 'maint' of git://github.com/git-l10n/git-po
2017-10-07 Junio C HamanoMerge branch 'rb/compat-poll-fix'
2017-10-07 Junio C HamanoMerge branch 'rs/qsort-s'
2017-10-05 Junio C HamanoMerge branch 'ar/request-pull-phrasofix'
2017-10-05 Junio C HamanoMerge branch 'sb/git-clang-format'
2017-10-04 Junio C HamanoMerge branch 'jk/ui-color-always-to-auto-maint' into...
2017-10-03 Junio C HamanoMerge branch 'bw/git-clang-format'
2017-10-03 Junio C HamanoMerge branch 'mr/doc-negative-pathspec'
2017-10-03 Junio C HamanoMerge branch 'sb/diff-color-move'
2017-10-03 Junio C HamanoMerge branch 'sd/branch-copy'
2017-10-03 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-09-29 Junio C HamanoMerge branch 'jt/fast-export-copy-modify-fix'
2017-09-28 Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix'
2017-09-28 Junio C HamanoMerge branch 'mk/diff-delta-avoid-large-offset'
2017-09-28 Junio C HamanoMerge branch 'mk/diff-delta-uint-may-be-shorter-than...
2017-09-28 Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28 Junio C HamanoMerge branch 'jk/doc-read-tree-table-asciidoctor-fix'
2017-09-28 Junio C HamanoMerge branch 'ik/userdiff-html-h-element-fix'
2017-09-28 Junio C HamanoMerge branch 'jk/diff-blob'
2017-09-28 Junio C HamanoMerge branch 'jk/describe-omit-some-refs'
2017-09-25 Junio C HamanoMerge branch 'ls/travis-scriptify'
2017-09-25 Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-25 Junio C HamanoMerge branch 'bw/git-clang-format'
2017-09-25 Junio C HamanoMerge branch 'rs/archive-excluded-directory'
2017-09-25 Junio C HamanoMerge branch 'kd/doc-for-each-ref'
2017-09-25 Junio C HamanoMerge branch 'cc/subprocess-handshake-missing-capabilities'
2017-09-25 Junio C HamanoMerge branch 'kw/write-index-reduce-alloc'
2017-09-22 Junio C HamanoSync with 2.13.6
2017-09-20 Junio C HamanoMerge branch 'jk/describe-omit-some-refs' into mk/descr...
2017-09-20 Junio C HamanoMerge branch 'jk/info-alternates-fix-2.11' into jk...
2017-09-19 Junio C HamanoMerge branch 'rk/commit-tree-make-F-verbatim'
2017-09-19 Junio C HamanoMerge branch 'jk/shortlog-ident-cleanup'
2017-09-19 Junio C HamanoMerge branch 'kw/merge-recursive-cleanup'
2017-09-19 Junio C HamanoMerge branch 'mh/packed-ref-store-prep'
2017-09-19 Junio C HamanoMerge branch 'ma/remove-config-maybe-bool'
2017-09-19 Junio C HamanoMerge branch 'jk/system-path-cleanup'
2017-09-19 Junio C HamanoMerge branch 'bb/doc-eol-dirty'
2017-09-19 Junio C HamanoMerge branch 'ma/split-symref-update-fix'
2017-09-19 Junio C HamanoMerge branch 'mh/notes-cleanup'
2017-09-19 Junio C HamanoMerge branch 'mg/timestamp-t-fix'
2017-09-19 Junio C HamanoMerge branch 'ma/pkt-line-leakfix'
next