Merge branch 'sb/submodule-cleanup'
[git] / git-mergetool.sh
2018-08-20  Junio C HamanoMerge branch 'sb/submodule-cleanup'
2018-08-20  Junio C HamanoMerge branch 'pw/rebase-i-merge-segv-fix'
2018-08-20  Junio C HamanoMerge branch 'pw/rebase-i-squash-number-fix'
2018-08-20  Junio C HamanoMerge branch 'sb/config-write-fix'
2018-08-20  Junio C HamanoMerge branch 'ab/submodule-relative-url-tests'
2018-08-20  Junio C HamanoMerge branch 'en/incl-forward-decl'
2018-08-20  Junio C HamanoMerge branch 'jt/repack-promisor-packs'
2018-08-20  Junio C HamanoMerge branch 'wc/make-funnynames-shared-lazy-prereq'
2018-08-20  Junio C HamanoMerge branch 'jh/partial-clone-doc'
2018-08-20  Junio C HamanoMerge branch 'js/chain-lint-attrfix'
2018-08-20  Junio C HamanoMerge branch 'sb/pull-rebase-submodule'
2018-08-20  Junio C HamanoMerge branch 'js/range-diff'
2018-08-20  Junio C HamanoMerge branch 'nd/no-the-index'
2018-08-20  Junio C HamanoMerge branch 'es/chain-lint-more'
2018-08-20  Junio C HamanoMerge branch 'sg/t5310-empty-input-fix'
2018-08-20  Junio C HamanoMerge branch 'js/mingw-o-append'
2018-08-20  Junio C HamanoMerge branch 'jk/for-each-object-iteration'
2018-08-20  Junio C HamanoMerge branch 'ab/fetch-tags-noclobber'
2018-08-20  Junio C HamanoMerge branch 'ng/mergetool-lose-final-prompt'
2018-08-20  Junio C HamanoMerge branch 'js/typofixes'
2018-08-15  Junio C HamanoMerge branch 'sb/histogram-less-memory'
2018-08-13  Nicholas Gurievmergetool: don't suggest to continue after last file
2018-07-24  Junio C HamanoMerge branch 'jk/fetch-all-peeled-fix'
2018-06-28  Junio C HamanoMerge branch 'jk/fetch-all-peeled-fix'
2018-05-30  Junio C HamanoMerge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-08  Junio C HamanoMerge branch 'ab/git-svn-get-record-typofix'
2018-04-25  Junio C HamanoMerge branch 'js/t5404-path-fix'
2018-04-25  Junio C HamanoMerge branch 'mn/send-email-credential-doc'
2018-04-25  Junio C HamanoMerge branch 'ak/bisect-doc-typofix'
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22  Junio C HamanoMerge branch 'cl/t9001-cleanup' into maint
2018-03-22  Junio C HamanoMerge branch 'nd/diff-flush-before-warning' into maint
2018-03-21  Junio C HamanoMerge branch 'dp/merge-strategy-doc-fix'
2018-03-08  Junio C HamanoMerge branch 'mk/doc-pretty-fill'
2018-03-06  Junio C HamanoMerge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02  Junio C HamanoMerge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02  Junio C HamanoMerge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28  Junio C HamanoMerge branch 'tz/do-not-clean-spec-file'
2018-02-28  Junio C HamanoMerge branch 'sb/status-doc-fix'
2018-02-27  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'
2018-02-27  Junio C HamanoMerge branch 'bp/name-hash-dirname-fix'
2018-02-15  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-13  Junio C HamanoMerge branch 'nd/diff-flush-before-warning'
2018-02-13  Junio C HamanoMerge branch 'cl/t9001-cleanup'
2018-01-23  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix'
2018-01-09  Junio C HamanoMerge branch 'js/misc-git-gui-stuff' of ../git-gui
2018-01-05  Junio C HamanoMerge branch 'jh/memihash-opt'
2017-12-28  Junio C HamanoMerge branch 'sr/http-sslverify-config-doc'
2017-12-27  Junio C HamanoMerge branch 'es/clone-shared-worktree'
2017-12-27  Junio C HamanoMerge branch 'jk/cvsimport-quoting'
2017-12-27  Junio C HamanoMerge branch 'rs/am-builtin-leakfix'
2017-12-05  Junio C HamanoMerge branch 'ls/no-double-utf8-author-name' of .....
2017-11-27  Junio C HamanoMerge branch 'rs/apply-fuzzy-match-fix' into maint
2017-11-22  Junio C HamanoMerge branch 'jn/reproducible-build' of ../git-gui...
2017-11-21  Junio C HamanoMerge branch 'rs/apply-fuzzy-match-fix'
2017-11-15  Junio C HamanoMerge branch 'dk/libsecret-unlock-to-load-fix' into...
2017-11-09  Junio C HamanoMerge branch 'dk/libsecret-unlock-to-load-fix'
2017-11-09  Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui...
2017-11-06  Junio C HamanoMerge branch 'ex/deprecate-empty-pathspec-as-match...
2017-10-28  Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-10-23  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-23  Junio C HamanoMerge branch 'jt/fast-export-copy-modify-fix' into...
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 'ma/pkt-line-leakfix' 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 'jk/describe-omit-some-refs' into maint
2017-10-18  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-10-07  Junio C HamanoMerge branch 'rs/qsort-s'
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 'rs/mailinfo-qp-decode-fix'
2017-09-28  Junio C HamanoMerge branch 'jk/describe-omit-some-refs'
2017-09-25  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-22  Junio C HamanoSync with 2.11.4
2017-09-22  Junio C HamanoSync with 2.10.5
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 'ma/pkt-line-leakfix'
2017-09-10  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix' into maint
2017-09-10  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'sb/sha1-file-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10  Junio C HamanoMerge branch 'ah/doc-empty-string-is-false' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10  Junio C HamanoMerge branch 'rj/add-chmod-error-message' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t3700-clean-leftover' into maint
2017-09-10  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t4062-obsd' into maint
2017-08-27  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix'
2017-08-27  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup'
2017-08-23  Junio C HamanoMerge branch 'js/run-process-parallel-api-fix' into...
2017-08-23  Junio C HamanoMerge branch 'sb/sha1-file-cleanup'
2017-08-23  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum'
2017-08-23  Junio C HamanoMerge branch 'ah/doc-empty-string-is-false'
2017-08-22  Junio C HamanoMerge branch 'rs/t4062-obsd'
next