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

2017-08-20	Junio C Hamano	Merge branch 'mg/format-ref-doc-fix' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'sb/submodule-parallel-update' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'jc/diff-sane-truncate-no-more' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'hv/t5526-andand-chain-fix' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'as/grep-quiet-no-match-exit-code-fix...	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'kw/commit-keep-index-when-pre-commit...	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'jt/diff-color-move-fix' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'cc/subprocess-handshake-missing-capabilit...	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'jk/trailers-parse' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'sb/sha1-file-cleanup' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'rs/t1002-do-not-use-sum' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'pb/trailers-from-command-line' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'kd/stash-with-bash-4.4' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'ah/doc-empty-string-is-false' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'rs/object-id' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'kw/rebase-progress' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'ks/prepare-commit-msg-sample-fix' into...	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'nm/stash-untracked' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'jt/sha1-file-cleanup' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'lg/merge-signoff' into next	blob \| commitdiff \| raw
2017-08-20	Junio C Hamano	Merge branch 'sb/diff-color-move' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'sb/retire-t1200' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/win32-syslog-leakfix' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/unpack-entry-leakfix' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/strbuf-getwholeline-fix' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/merge-microcleanup' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/fsck-obj-leakfix' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/t4062-obsd' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/find-pack-entry-bisection' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/apply-lose-prefix-length' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rj/add-chmod-error-message' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'jk/hashcmp-memcmp' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'jk/drop-sha1-entry-pos' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'ur/svn-local-zone' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'pw/am-signoff' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/t3700-clean-leftover' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'jc/perl-git-comment-typofix' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/in-obsd-basename-dirname-take-const...	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'rs/obsd-getcwd-workaround' into next	blob \| commitdiff \| raw
2017-08-18	Junio C Hamano	Merge branch 'mf/no-dashed-subcommands' into next	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
2012-06-17	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error' into...	blob \| commitdiff \| raw \| diff to current
2012-06-12	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error'	blob \| commitdiff \| raw \| diff to current
2012-04-26	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw \| diff to current
2012-04-16	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw \| diff to current
2012-04-10	David A. Greene	Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...	blob \| commitdiff \| raw \| diff to current
2012-04-02	Junio C Hamano	Merge branch 'pt/gitk'	blob \| commitdiff \| raw \| diff to current
2012-03-24	Junio C Hamano	Merge gitk changes from Paul Mackerras at git://ozlabs...	blob \| commitdiff \| raw \| diff to current
2011-12-18	Junio C Hamano	Update jk/maint-strbuf-missing-init to builtin/ rename	blob \| commitdiff \| raw \| diff to current
2011-12-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'ml/mailmap' into maint-1.7.6	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2011-11-23	Junio C Hamano	Merge branch 'maint' into tj/imap-send-remove-unused	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom