Merge branch 'en/rerere-multi-stage-1-fix' into maint
[git] / git-mergetool.sh
2018-11-21  Junio C HamanoMerge branch 'en/rerere-multi-stage-1-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'js/mingw-o-append' into maint
2018-11-21  Junio C HamanoMerge branch 'jk/reopen-tempfile-truncate' into maint
2018-11-21  Junio C HamanoMerge branch 'bp/mv-submodules-with-fsmonitor' into...
2018-11-21  Junio C HamanoMerge branch 'js/rebase-i-autosquash-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'jk/trailer-fixes' into maint
2018-09-27  Junio C HamanoSync with 2.18.1
2018-09-10  Junio C HamanoMerge branch 'mk/http-backend-content-length'
2018-09-04  Junio C HamanoMerge branch 'es/chain-lint-more'
2018-09-04  Junio C HamanoMerge branch 'es/freebsd-iconv-portability'
2018-09-04  Junio C HamanoMerge branch 'ds/commit-graph-lockfile-fix'
2018-09-04  Junio C HamanoMerge branch 'en/directory-renames-nothanks'
2018-09-04  Junio C HamanoMerge branch 'pw/rebase-i-author-script-fix'
2018-08-27  Junio C HamanoMerge branch 'ds/commit-graph-fsck'
2018-08-27  Junio C HamanoMerge branch 'js/range-diff'
2018-08-27  Junio C HamanoMerge branch 'sg/test-rebase-editor-fix'
2018-08-27  Junio C HamanoMerge branch 'ab/test-must-be-empty-for-master'
2018-08-27  Junio C HamanoMerge branch 'sg/t3420-autostash-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t3903-missing-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t7501-thinkofix'
2018-08-27  Junio C HamanoMerge branch 'sg/t0020-conversion-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t4051-fix'
2018-08-27  Junio C HamanoMerge branch 'js/larger-timestamps'
2018-08-27  Junio C HamanoMerge branch 'jk/use-compat-util-in-test-tool'
2018-08-27  Junio C HamanoMerge branch 'sg/test-must-be-empty'
2018-08-27  Junio C HamanoMerge branch 'rs/opt-updates'
2018-08-27  Junio C HamanoMerge branch 'ab/unconditional-free-and-null'
2018-08-27  Junio C HamanoMerge branch 'ep/worktree-quiet-option'
2018-08-27  Junio C HamanoMerge branch 'sm/branch-sort-config'
2018-08-27  Junio C HamanoMerge branch 'nd/config-core-checkstat-doc'
2018-08-22  Junio C HamanoMerge branch 'nd/pack-deltify-regression-fix'
2018-08-21  Jiang XinMerge branch 'maint' of git://github.com/git-l10n/git-po
2018-08-20  Junio C HamanoMerge branch 'ab/checkout-default-remote'
2018-08-20  Junio C HamanoMerge branch 'hn/highlight-sideband-keywords'
2018-08-20  Junio C HamanoMerge branch 'nd/cherry-pick-quit-fix'
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
next