builtin/merge: honor commit-msg hook for merges
[git] / git-merge-resolve.sh
2017-09-06  Junio C HamanoMerge branch 'rs/archive-excluded-directory'
2017-09-06  Junio C HamanoMerge branch 'po/read-graft-line'
2017-09-06  Junio C HamanoMerge branch 'ks/branch-set-upstream'
2017-08-27  Junio C HamanoMerge branch 'mg/killed-merge'
2017-08-27  Junio C HamanoMerge branch 'mh/ref-lock-entry'
2017-08-27  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix'
2017-08-27  Junio C HamanoMerge branch 'jc/cutoff-config'
2017-08-27  Junio C HamanoMerge branch 'kw/write-index-reduce-alloc'
2017-08-27  Junio C HamanoMerge branch 'bw/submodule-config-cleanup'
2017-08-27  Junio C HamanoMerge branch 'js/gitweb-raw-blob-link-in-history'
2017-08-27  Junio C HamanoMerge branch 'po/object-id'
2017-08-27  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'tb/apply-with-crlf'
2017-08-27  Junio C HamanoMerge branch 'jt/stash-tests'
2017-08-27  Junio C HamanoMerge branch 'jk/trailers-parse'
2017-08-27  Junio C HamanoMerge branch 'pb/trailers-from-command-line'
2017-08-27  Junio C HamanoMerge branch 'jt/diff-color-move-fix'
2017-08-27  Junio C HamanoMerge branch 'sb/diff-color-move'
2017-08-24  Junio C HamanoMerge branch 'jk/doc-the-this'
2017-08-24  Junio C HamanoMerge branch 'rs/commit-h-single-parent-cleanup'
2017-08-24  Junio C HamanoMerge branch 'jc/simplify-progress'
2017-08-24  Junio C HamanoMerge branch 'tc/curl-with-backports'
2017-08-24  Junio C HamanoMerge branch 'cc/subprocess-handshake-missing-capabilities'
2017-08-24  Junio C HamanoMerge branch 'rs/object-id'
2017-08-24  Junio C HamanoMerge branch 'lg/merge-signoff'
2017-08-23  Junio C HamanoSync with maint
2017-08-23  Junio C HamanoMerge branch 'mg/format-ref-doc-fix'
2017-08-23  Junio C HamanoMerge branch 'sb/submodule-parallel-update'
2017-08-23  Junio C HamanoMerge branch 'jc/diff-sane-truncate-no-more'
2017-08-23  Junio C HamanoMerge branch 'hv/t5526-andand-chain-fix'
2017-08-23  Junio C HamanoMerge branch 'as/grep-quiet-no-match-exit-code-fix'
2017-08-23  Junio C HamanoMerge branch 'kw/commit-keep-index-when-pre-commit...
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 'kd/stash-with-bash-4.4'
2017-08-23  Junio C HamanoMerge branch 'ah/doc-empty-string-is-false'
2017-08-23  Junio C HamanoMerge branch 'kw/rebase-progress'
2017-08-23  Junio C HamanoMerge branch 'ks/prepare-commit-msg-sample-fix'
2017-08-23  Junio C HamanoMerge branch 'nm/stash-untracked'
2017-08-23  Junio C HamanoMerge branch 'jt/sha1-file-cleanup'
2017-08-22  Junio C HamanoMerge branch 'mh/packed-ref-store'
2017-08-22  Junio C HamanoMerge branch 'sb/retire-t1200'
2017-08-22  Junio C HamanoMerge branch 'rs/win32-syslog-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/unpack-entry-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/strbuf-getwholeline-fix'
2017-08-22  Junio C HamanoMerge branch 'rs/merge-microcleanup'
2017-08-22  Junio C HamanoMerge branch 'rs/fsck-obj-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/t4062-obsd'
2017-08-22  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection'
2017-08-22  Junio C HamanoMerge branch 'rs/apply-lose-prefix-length'
2017-08-22  Junio C HamanoMerge branch 'rj/add-chmod-error-message'
2017-08-22  Junio C HamanoMerge branch 'jk/hashcmp-memcmp'
2017-08-22  Junio C HamanoMerge branch 'jk/drop-sha1-entry-pos'
2017-08-22  Junio C HamanoMerge branch 'ur/svn-local-zone'
2017-08-22  Junio C HamanoMerge branch 'pw/am-signoff'
2017-08-22  Junio C HamanoMerge branch 'rs/t3700-clean-leftover'
2017-08-22  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix'
2017-08-22  Junio C HamanoMerge branch 'rs/in-obsd-basename-dirname-take-const'
2017-08-22  Junio C HamanoMerge branch 'rs/obsd-getcwd-workaround'
2017-08-22  Junio C HamanoMerge branch 'mf/no-dashed-subcommands'
2017-08-07  Michael Forneyscripts: use "git foo" not "git-foo"
2017-07-25  Junio C HamanoMerge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-04-17  Junio C HamanoMerge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-01-18  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2016-10-20  Junio C HamanoMerge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26  Junio C HamanoMerge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26  Junio C HamanoMerge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix'
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
next