git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - t/t6037-merge-ours-theirs.sh

projects / thirdparty / git.git / history

[thirdparty/git.git] / t / t6037-merge-ours-theirs.sh

2010-08-31	Junio C Hamano	Merge branch 'en/fast-export-fix'	blob \| commitdiff \| raw
2010-08-31	Junio C Hamano	Merge branch 'hv/autosquash-config'	blob \| commitdiff \| raw
2010-08-31	Junio C Hamano	Merge branch 'sg/rerere-gc-old-still-used'	blob \| commitdiff \| raw
2010-08-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2010-08-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2010-08-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2010-08-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'mm/rebase-i-exec'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'gb/split-cmdline-errmsg'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'so/http-user-agent'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'mm/shortopt-detached'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'sr/local-config'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'nd/fix-sparse-checkout'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'hv/submodule-find-ff-merge'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'en/rebase-against-rebase-fix'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'dg/local-mod-error-messages'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'po/userdiff-csharp'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'ab/perl-install'	blob \| commitdiff \| raw
2010-08-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2010-08-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2010-08-19	Junio C Hamano	Merge branch 'maint' to sync with 1.7.2.2	blob \| commitdiff \| raw
2010-08-19	Junio C Hamano	Merge branch 'tr/xsize-bits' into maint	blob \| commitdiff \| raw \| diff to current
2010-08-18	Junio C Hamano	Merge branch 'sp/fix-smart-http-deadlock-on-error'...	blob \| commitdiff \| raw \| diff to current
2010-08-18	Junio C Hamano	Merge branch 'jc/maint-follow-rename-fix'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'tf/string-list-init'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'cc/find-commit-subject'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'jn/maint-plug-leak'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'jl/submodule-ignore-diff'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'ml/rebase-x-strategy'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'jn/fix-abbrev'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'vs/doc-spell'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'jh/use-test-must-fail'	blob \| commitdiff \| raw
2010-08-18	Junio C Hamano	Merge branch 'tr/xsize-bits'	blob \| commitdiff \| raw \| diff to current
2010-08-13	Junio C Hamano	Merge branch 'sp/fix-smart-http-deadlock-on-error'	blob \| commitdiff \| raw \| diff to current
2010-08-02	Junio C Hamano	Merge git://repo.or.cz/git-gui into pt/git-gui	blob \| commitdiff \| raw \| diff to current
2010-07-26	Junio C Hamano	Merge branch 'maint-1.6.6' into maint-1.7.0	blob \| commitdiff \| raw \| diff to current
2010-07-20	Jared Hance	Convert "! git" to "test_must_fail git"	blob \| commitdiff \| raw
2010-07-16	Junio C Hamano	Merge branch 'jc/diff-merge-base-multi'	blob \| commitdiff \| raw \| diff to current
2010-07-15	Junio C Hamano	Merge branch 'jc/diff-merge-base-multi'	blob \| commitdiff \| raw \| diff to current
2010-07-09	Junio C Hamano	Merge remote branch 'ko/master' into jc/read-tree-cache...	blob \| commitdiff \| raw \| diff to current
2010-07-07	Junio C Hamano	Merge branch 'maint-1.6.4' into maint	blob \| commitdiff \| raw \| diff to current
2010-06-16	Junio C Hamano	Merge branch 'jc/am-3-show-corrupted-patch' into maint	blob \| commitdiff \| raw \| diff to current
2010-06-16	Junio C Hamano	Merge branch 'sp/maint-describe-tiebreak-with-tagger...	blob \| commitdiff \| raw \| diff to current
2010-06-16	Junio C Hamano	Merge branch 'hg/maint-attr-fix' into maint	blob \| commitdiff \| raw \| diff to current
2010-05-21	Junio C Hamano	Merge branch 'jn/gitweb-our-squelch'	blob \| commitdiff \| raw \| diff to current
2010-05-21	Junio C Hamano	Merge branch 'jc/am-3-show-corrupted-patch'	blob \| commitdiff \| raw \| diff to current
2010-05-21	Junio C Hamano	Merge branch 'jc/maint-no-reflog-expire-unreach-for...	blob \| commitdiff \| raw \| diff to current
2010-05-21	Junio C Hamano	Merge branch 'sp/maint-describe-tiebreak-with-tagger...	blob \| commitdiff \| raw \| diff to current
2010-05-09	Junio C Hamano	Merge branch 'hg/maint-attr-fix'	blob \| commitdiff \| raw \| diff to current
2010-05-09	Junio C Hamano	Merge branch 'jc/maint-reflog-expire-unreachable'	blob \| commitdiff \| raw \| diff to current
2010-04-23	Junio C Hamano	Merge branch 'jk/maint-diffstat-overflow' into maint	blob \| commitdiff \| raw \| diff to current
2010-04-19	Junio C Hamano	Merge branch 'maint-1.6.6' into maint	blob \| commitdiff \| raw \| diff to current
2010-04-19	Junio C Hamano	Merge branch 'jk/maint-diffstat-overflow'	blob \| commitdiff \| raw \| diff to current
2010-04-19	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2010-04-11	Junio C Hamano	Merge branch 'rc/maint-reflog-msg-for-forced-branch...	blob \| commitdiff \| raw \| diff to current
2010-04-10	Junio C Hamano	Merge branch 'jc/conflict-marker-size' into maint	blob \| commitdiff \| raw \| diff to current
2010-04-10	Junio C Hamano	Merge branch 'mg/maint-send-email-lazy-editor' into...	blob \| commitdiff \| raw \| diff to current
2010-04-10	Junio C Hamano	Merge branch 'rc/maint-reflog-msg-for-forced-branch'	blob \| commitdiff \| raw \| diff to current
2010-04-06	Junio C Hamano	Merge branch 'jc/conflict-marker-size'	blob \| commitdiff \| raw \| diff to current
2010-04-03	Junio C Hamano	Merge branch 'mg/maint-send-email-lazy-editor'	blob \| commitdiff \| raw \| diff to current
2010-03-31	Junio C Hamano	Merge branch 'jc/maint-refs-dangling' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-29	Junio C Hamano	Merge branch 'cp/add-u-pathspec' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-24	Junio C Hamano	Merge branch 'jc/maint-refs-dangling'	blob \| commitdiff \| raw \| diff to current
2010-03-24	Junio C Hamano	Merge branch 'jc/color-attrs' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-24	Junio C Hamano	Merge branch 'jk/maint-add-ignored-dir' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-22	Junio C Hamano	Merge branch 'maint-1.6.6' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-20	Junio C Hamano	Merge branch 'jk/maint-add-ignored-dir'	blob \| commitdiff \| raw \| diff to current
2010-03-20	Junio C Hamano	Merge branch 'jc/color-attrs'	blob \| commitdiff \| raw \| diff to current
2010-03-10	Junio C Hamano	Merge branch 'cp/add-u-pathspec'	blob \| commitdiff \| raw \| diff to current
2010-03-08	Junio C Hamano	Merge branch 'fn/maint-mkdtemp-compat' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-08	Junio C Hamano	Merge branch 'jk/maint-push-tracking-wo-remote' into...	blob \| commitdiff \| raw \| diff to current
2010-03-08	Junio C Hamano	Merge branch 'jk/maint-add--interactive-delete' into...	blob \| commitdiff \| raw \| diff to current
2010-03-08	Junio C Hamano	Merge branch 'jc/grep-author-all-match-implicit' into...	blob \| commitdiff \| raw \| diff to current
2010-03-08	Junio C Hamano	Merge branch 'maint-1.6.6' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-07	Junio C Hamano	Merge branch 'fn/maint-mkdtemp-compat'	blob \| commitdiff \| raw \| diff to current
2010-03-07	Junio C Hamano	Merge branch 'jk/maint-push-tracking-wo-remote'	blob \| commitdiff \| raw \| diff to current
2010-03-07	Junio C Hamano	Merge branch 'nd/root-git'	blob \| commitdiff \| raw \| diff to current
2010-03-07	Junio C Hamano	Merge branch 'jk/maint-add--interactive-delete'	blob \| commitdiff \| raw \| diff to current
2010-03-05	Junio C Hamano	Merge branch 'tr/maint-cherry-pick-list' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-05	Junio C Hamano	Merge branch 'rs/optim-text-wrap' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-05	Junio C Hamano	Merge branch 'gf/maint-sh-setup-nongit-ok' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-05	Junio C Hamano	Merge branch 'cc/maint-bisect-paths' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-05	Junio C Hamano	Merge branch 'maint-1.6.6' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-03	Junio C Hamano	Merge branch 'hm/maint-imap-send-crlf' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-03	Junio C Hamano	Merge branch 'sp/maint-push-sideband' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-03	Junio C Hamano	Merge branch 'jc/maint-fix-test-perm' into maint	blob \| commitdiff \| raw \| diff to current
2010-03-02	Junio C Hamano	Merge branch 'tr/maint-cherry-pick-list'	blob \| commitdiff \| raw \| diff to current
2010-03-02	Junio C Hamano	Merge branch 'rs/optim-text-wrap'	blob \| commitdiff \| raw \| diff to current
2010-03-02	Junio C Hamano	Merge branch 'gf/maint-sh-setup-nongit-ok'	blob \| commitdiff \| raw \| diff to current
2010-03-02	Junio C Hamano	Merge branch 'jc/grep-author-all-match-implicit'	blob \| commitdiff \| raw \| diff to current
2010-03-01	Junio C Hamano	Merge branch 'cc/maint-bisect-paths'	blob \| commitdiff \| raw \| diff to current
2010-02-26	Junio C Hamano	Merge branch 'maint-1.6.6' into maint	blob \| commitdiff \| raw \| diff to current
2010-02-24	Junio C Hamano	Merge branch 'ml/maint-grep-doc' into maint	blob \| commitdiff \| raw \| diff to current
2010-02-23	Junio C Hamano	Merge branch 'il/rev-glob'	blob \| commitdiff \| raw \| diff to current
2010-02-21	Junio C Hamano	Merge branch 'ml/maint-grep-doc'	blob \| commitdiff \| raw \| diff to current
2010-02-21	Junio C Hamano	Merge branch 'hm/maint-imap-send-crlf'	blob \| commitdiff \| raw \| diff to current
2010-02-21	Junio C Hamano	Merge branch 'jc/maint-fix-test-perm'	blob \| commitdiff \| raw \| diff to current
2010-02-19	Junio C Hamano	Merge branch 'jk/maint-rmdir-fix' into maint	blob \| commitdiff \| raw \| diff to current
2010-02-16	Junio C Hamano	Merge branch 'maint-1.6.6' into maint	blob \| commitdiff \| raw \| diff to current
2010-02-15	Junio C Hamano	Merge branch 'maint-1.6.6' into maint	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom