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

2016-05-17	Junio C Hamano	Merge branch 'ab/hooks'	blob \| commitdiff \| raw
2016-05-17	Junio C Hamano	Merge branch 'sb/submodule-init'	blob \| commitdiff \| raw
2016-05-13	Junio C Hamano	Merge branch 'sb/submodule-module-list-pathspec-fix'	blob \| commitdiff \| raw
2016-05-13	Junio C Hamano	Merge branch 'jc/commit-tree-ignore-commit-gpgsign'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'sk/gitweb-highlight-encoding'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'sb/clean-test-fix'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'rn/glossary-typofix'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'ls/travis-submitting-patches'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'js/close-packs-before-gc'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'ew/normal-to-e'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'ls/p4-lfs'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'sb/misc-cleanups'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'ew/doc-split-pack-disables-bitmap'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'jk/diff-compact-heuristic'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'ls/p4-lfs-test-fix-2.7.0'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'bc/object-id'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'bw/rebase-merge-entire-branch'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'jc/drop-git-spec-in'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'js/http-custom-headers'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'sb/clone-shallow-passthru'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'ld/p4-test-py3'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'sb/config-exit-status-list'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'nf/mergetool-prompt'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'jd/send-email-to-whom'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'rt/string-list-lookup-cleanup'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'jk/fix-attribute-macro-in-2.5'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'sg/test-lib-simplify-expr-away'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'nd/remove-unused'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'js/name-rev-use-oldest-ref'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'jd/p4-jobs-in-commit'	blob \| commitdiff \| raw
2016-05-03	Junio C Hamano	Merge branch 'en/merge-fixes'	blob \| commitdiff \| raw
2016-05-02	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Sync with 2.8.2	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Merge branch 'st/verify-tag'	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Merge branch 'js/win32-mmap'	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Merge branch 'jc/merge-refuse-new-root'	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Merge branch 'jk/push-client-deadlock-fix'	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Merge branch 'js/replace-edit-use-editor-configuration'	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Merge branch 'sb/mv-submodule-fix'	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Merge branch 'nd/test-helpers'	blob \| commitdiff \| raw
2016-04-29	Junio C Hamano	Merge branch 'da/user-useconfigonly'	blob \| commitdiff \| raw
2016-04-25	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2016-04-25	Junio C Hamano	Merge branch 'sb/submodule-path-misc-bugs'	blob \| commitdiff \| raw
2016-04-25	Junio C Hamano	Merge branch 'en/merge-trivial-fix'	blob \| commitdiff \| raw
2016-04-13	Elijah Newren	builtin/merge.c: fix a bug with trivial merges	blob \| commitdiff \| raw
2016-04-13	Elijah Newren	t7605: add a testcase demonstrating a bug with trivial...	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-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/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 '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
2011-11-10	Junio C Hamano	Merge 'build-in git-mktree'	blob \| commitdiff \| raw \| diff to current
2011-11-09	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref' into maint	blob \| commitdiff \| raw \| diff to current
2011-10-21	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref'	blob \| commitdiff \| raw \| diff to current
2011-10-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom