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