git.oblomov.eu Git - git/history - git-merge-resolve.sh

2017-10-23	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'ma/ts-cleanups' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'ls/travis-scriptify' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'jt/fast-export-copy-modify-fix' into...	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'nd/worktree-kill-parse-ref' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/qsort-s' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mr/doc-negative-pathspec' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/doc-read-tree-table-asciidoctor-fix...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'kd/doc-for-each-ref' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'cc/subprocess-handshake-missing-capabilit...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/system-path-cleanup' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'bb/doc-eol-dirty' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mg/timestamp-t-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ma/pkt-line-leakfix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/config-lockfile-leak-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'dw/diff-highlight-makefile-fix' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/drop-sha1-entry-pos' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rb/compat-poll-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ar/request-pull-phrasofix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/mailinfo-qp-decode-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ik/userdiff-html-h-element-fix' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/diff-blob' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/describe-omit-some-refs' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'aw/gc-lockfile-fscanf-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/archive-excluded-directory' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rk/commit-tree-make-F-verbatim' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mh/packed-ref-store-prep' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/strbuf-getwholeline-fix' into maint	blob \| commitdiff \| raw
2017-10-17	Junio C Hamano	Merge branch 'jk/ui-color-always-to-auto-maint' (early...	blob \| commitdiff \| raw
2017-09-22	Junio C Hamano	Sync with 2.13.6	blob \| commitdiff \| raw
2017-09-20	Junio C Hamano	Merge branch 'jk/info-alternates-fix-2.11' into jk...	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jt/doc-pack-objects-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jn/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'bc/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jk/doc-the-this' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/commit-h-single-parent-cleanup' into...	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'mg/format-ref-doc-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'sb/submodule-parallel-update' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'hv/t5526-andand-chain-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'sb/sha1-file-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/t1002-do-not-use-sum' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'ah/doc-empty-string-is-false' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/merge-microcleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/find-pack-entry-bisection' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/apply-lose-prefix-length' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rj/add-chmod-error-message' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jk/hashcmp-memcmp' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/t3700-clean-leftover' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jc/perl-git-comment-typofix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'mf/no-dashed-subcommands' into maint	blob \| commitdiff \| raw
2017-08-07	Michael Forney	scripts: use "git foo" not "git-foo"	blob \| commitdiff \| raw
2017-07-25	Junio C Hamano	Merge branch 'js/msgfmt-on-windows' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jc/bs-t-is-not-a-tab-for-sed'	blob \| commitdiff \| raw \| diff to current
2017-01-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2016-10-20	Junio C Hamano	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'va/i18n' of ../git-gui into va/git-gui...	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'rs/use-modern-git-merge-syntax' of git...	blob \| commitdiff \| raw \| diff to current
2016-09-11	Junio C Hamano	Merge branch 'js/commit-gpgsign' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2016-09-07	Junio C Hamano	Merge branch 'sy/i18n' of git-gui	blob \| commitdiff \| raw \| diff to current
2016-03-21	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-12-21	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-10-16	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| commitdiff \| raw \| diff to current
2015-10-05	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-09-04	Junio C Hamano	Merge branch 'sg/t3020-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-08-26	Junio C Hamano	Merge branch 'sg/t3020-typofix'	blob \| commitdiff \| raw \| diff to current
2015-04-19	Junio C Hamano	Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw \| diff to current
2015-03-24	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-10-29	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix' into...	blob \| commitdiff \| raw \| diff to current
2014-10-14	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix'	blob \| commitdiff \| raw \| diff to current
2014-09-26	Junio C Hamano	Merge branch 'sb/help-unknown-command-sort-fix'	blob \| commitdiff \| raw \| diff to current
2014-08-10	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-06-27	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-06-26	Junio C Hamano	Merge early parts from git://ozlabs.org/~paulus/gitk.git	blob \| commitdiff \| raw \| diff to current
2014-06-26	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| commitdiff \| raw \| diff to current
2014-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-01-21	Junio C Hamano	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw \| diff to current
2013-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-12-09	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-11-07	Junio C Hamano	Merge branch 'vd/doc-unpack-objects' into maint	blob \| commitdiff \| raw \| diff to current
2013-11-04	Junio C Hamano	Merge branch 'vd/doc-unpack-objects'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'jk/refs-c-squelch-gcc'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'jk/date-c-double-semicolon'	blob \| commitdiff \| raw \| diff to current
2013-06-17	Junio C Hamano	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-05-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-05-13	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-03-28	Junio C Hamano	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| commitdiff \| raw \| diff to current
2013-01-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2012-10-17	Junio C Hamano	Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2012-09-15	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents' into maint...	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents'	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'ms/daemon-doc-typo' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'ms/daemon-doc-typo'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom