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

2012-10-17	Junio C Hamano	Merge branch 'jk/maint-http-half-auth-push' into maint	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'rr/git-uri-doc' into maint	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'bw/cp-a-is-gnuism' into maint	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'nd/doc-ignore' into maint	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'jc/doc-long-options' into maint	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'jc/maint-t1450-fsck-order-fix' into maint	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'rr/test-use-shell-path-not-shell' into...	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'rr/test-make-sure-we-have-git' into maint	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'po/maint-docs' into maint	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge branch 'jc/ll-merge-binary-ours' into maint	blob \| commitdiff \| raw
2012-10-16	Junio C Hamano	Merge branch 'jk/maint-http-half-auth-push'	blob \| commitdiff \| raw
2012-10-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2012-10-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2012-10-10	Junio C Hamano	Merge branch 'rr/git-uri-doc'	blob \| commitdiff \| raw
2012-10-10	Junio C Hamano	Merge branch 'bw/cp-a-is-gnuism'	blob \| commitdiff \| raw
2012-10-10	Junio C Hamano	Merge branch 'nd/doc-ignore'	blob \| commitdiff \| raw
2012-10-10	Junio C Hamano	Merge branch 'jc/doc-long-options'	blob \| commitdiff \| raw
2012-10-10	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2012-10-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2012-10-08	Junio C Hamano	Merge branch 'jc/maint-t1450-fsck-order-fix'	blob \| commitdiff \| raw
2012-10-08	Junio C Hamano	Merge branch 'jc/merge-bases-paint-fix'	blob \| commitdiff \| raw
2012-10-08	Junio C Hamano	Sync with 1.7.12.3	blob \| commitdiff \| raw
2012-10-03	Junio C Hamano	Merge branch 'lt/mailinfo-handle-attachment-more-sanely'	blob \| commitdiff \| raw
2012-10-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2012-10-01	Junio C Hamano	Merge branch 'jk/completion-tests'	blob \| commitdiff \| raw
2012-10-01	Junio C Hamano	Merge branch 'ep/malloc-check-perturb'	blob \| commitdiff \| raw
2012-10-01	Junio C Hamano	Merge branch 'da/mergetool-custom'	blob \| commitdiff \| raw
2012-10-01	Junio C Hamano	Merge branch 'os/commit-submodule-ignore'	blob \| commitdiff \| raw
2012-10-01	Junio C Hamano	Merge branch 'jc/blame-follows-renames'	blob \| commitdiff \| raw
2012-10-01	Junio C Hamano	Merge branch 'jk/receive-pack-unpack-error-to-pusher'	blob \| commitdiff \| raw
2012-10-01	Junio C Hamano	Merge branch 'rt/maint-clone-single'	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Merge git://github.com/git-l10n/git-po	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Sync with 1.7.12.2	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Merge branch 'rr/maint-submodule-unknown-cmd'	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Merge branch 'rs/archive-zip-utf8'	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Merge branch 'jk/smart-http-switch'	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Merge branch 'sp/maint-http-enable-gzip'	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Merge branch 'sp/maint-http-info-refs-no-retry'	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Merge branch 'js/rebase-exec-command-not-found'	blob \| commitdiff \| raw
2012-09-30	Junio C Hamano	Merge branch 'rr/test-use-shell-path-not-shell'	blob \| commitdiff \| raw
2012-09-25	Junio C Hamano	Merge branch 'rr/test-make-sure-we-have-git'	blob \| commitdiff \| raw
2012-09-25	Junio C Hamano	Merge branch 'ep/malloc-check-perturb'	blob \| commitdiff \| raw
2012-09-25	Junio C Hamano	Merge branch 'aj/xfuncname-ada'	blob \| commitdiff \| raw
2012-09-25	Junio C Hamano	Merge branch 'jc/maint-mailinfo-mime-attr'	blob \| commitdiff \| raw
2012-09-25	Junio C Hamano	Merge branch 'po/maint-docs'	blob \| commitdiff \| raw
2012-09-25	Junio C Hamano	Merge branch 'db/doc-custom-xmlto'	blob \| commitdiff \| raw
2012-09-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2012-09-24	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2012-09-21	Junio C Hamano	Merge branch 'mh/fetch-filter-refs'	blob \| commitdiff \| raw
2012-09-21	Junio C Hamano	Merge branch 'jc/maint-log-grep-all-match-1'	blob \| commitdiff \| raw
2012-09-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2012-09-18	Junio C Hamano	Merge branch 'jc/maint-log-grep-all-match'	blob \| commitdiff \| raw
2012-09-18	Junio C Hamano	Merge branch 'pw/p4-submit-conflicts'	blob \| commitdiff \| raw
2012-09-18	Junio C Hamano	Merge branch 'mv/cherry-pick-s'	blob \| commitdiff \| raw
2012-09-18	Junio C Hamano	Merge branch 'nd/fetch-status-alignment'	blob \| commitdiff \| raw
2012-09-18	Junio C Hamano	Sync with 1.7.12.1	blob \| commitdiff \| raw
2012-09-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2012-09-17	Junio C Hamano	Merge branch 'mh/fetch-filter-refs'	blob \| commitdiff \| raw
2012-09-17	Junio C Hamano	Merge branch 'nd/maint-diffstat-summary'	blob \| commitdiff \| raw
2012-09-17	Junio C Hamano	Merge branch 'jk/config-warn-on-inaccessible-paths'	blob \| commitdiff \| raw
2012-09-17	Junio C Hamano	Merge branch 'jw/doc-commit-title'	blob \| commitdiff \| raw
2012-09-17	Junio C Hamano	Merge branch 'mh/string-list'	blob \| commitdiff \| raw
2012-09-17	Junio C Hamano	Merge branch 'jc/maint-blame-no-such-path'	blob \| commitdiff \| raw
2012-09-15	Junio C Hamano	Merge branch 'jc/ll-merge-binary-ours'	blob \| commitdiff \| raw
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-09-09	Junio C Hamano	attr: "binary" attribute should choose built-in "binary...	blob \| commitdiff \| raw
2012-09-09	Junio C Hamano	merge: teach -Xours/-Xtheirs to binary ll-merge driver	blob \| commitdiff \| raw \| diff to current
2012-08-24	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'jn/block-sha1' into maint	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-24	Junio C Hamano	Merge branch 'jn/block-sha1'	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'...	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' 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-07-16	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare'	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'	blob \| commitdiff \| raw \| diff to current
2012-07-11	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into tg...	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch'	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
2012-03-16	Junio C Hamano	Merge branch 'th/doc-diff-submodule-option'	blob \| commitdiff \| raw \| diff to current
2012-02-27	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix' into...	blob \| commitdiff \| raw \| diff to current
2012-02-23	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix'	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-22	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init'	blob \| commitdiff \| raw \| diff to current
2011-12-21	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report' into...	blob \| commitdiff \| raw \| diff to current
2011-12-21	Junio C Hamano	Merge branch 'ms/commit-cc-option-helpstring' into...	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 'jl/submodule-status-failure-report'	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint-1.7.6	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
next

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

RSS Atom