git.oblomov.eu Git - git/history - t/t6021-merge-criss-cross.sh

2013-09-04	Junio C Hamano	Merge branch 'tr/fd-gotcha-fixes'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'bc/unuse-packfile'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'da/darwin'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'jk/fast-import-empty-ls'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'km/svn-1.8-serf-only'	blob \| commitdiff \| raw
2013-09-04	Junio C Hamano	Merge branch 'jc/check-x-z'	blob \| commitdiff \| raw
2013-09-03	Junio C Hamano	Merge branch 'maint-1.8.2' into maint-1.8.3	blob \| commitdiff \| raw
2013-08-30	Junio C Hamano	Merge branch 'rj/doc-rev-parse'	blob \| commitdiff \| raw
2013-08-30	Junio C Hamano	Merge branch 'hv/config-from-blob'	blob \| commitdiff \| raw
2013-08-13	Junio C Hamano	Merge branch 'sb/mailmap-updates'	blob \| commitdiff \| raw
2013-08-09	Junio C Hamano	Merge branch 'jk/submodule-subdirectory-ok'	blob \| commitdiff \| raw
2013-08-09	Junio C Hamano	Merge branch 'sb/mailmap-updates'	blob \| commitdiff \| raw
2013-08-05	Junio C Hamano	Merge branch 'es/blame-L-breakage'	blob \| commitdiff \| raw
2013-08-05	Junio C Hamano	Merge branch 'sb/mailmap-updates'	blob \| commitdiff \| raw
2013-08-05	Junio C Hamano	Merge branch 'dn/test-reject-utf-16'	blob \| commitdiff \| raw
2013-08-05	Junio C Hamano	Merge branch 'bc/commit-invalid-utf8'	blob \| commitdiff \| raw
2013-08-02	Junio C Hamano	Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'	blob \| commitdiff \| raw
2013-08-02	Junio C Hamano	Merge branch 'jk/cat-file-batch-optim'	blob \| commitdiff \| raw
2013-08-01	Junio C Hamano	Merge branch 'jc/rm-submodule-error-message'	blob \| commitdiff \| raw
2013-08-01	Junio C Hamano	Merge branch 'lf/echo-n-is-not-portable'	blob \| commitdiff \| raw
2013-08-01	Junio C Hamano	Merge branch 'jx/clean-interactive'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'rr/rebase-autostash'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'rj/commit-slab-fix'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'jk/commit-how-to-abort-cherry-pick'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'ds/doc-two-kinds-of-tags'	blob \| commitdiff \| raw
2013-07-31	Junio C Hamano	Merge branch 'mh/packed-refs-do-one-ref-recursion'	blob \| commitdiff \| raw
2013-07-30	Junio C Hamano	Merge branch 'jk/capabilities-doc'	blob \| commitdiff \| raw
2013-07-30	Junio C Hamano	Merge branch 'sb/mailmap-updates'	blob \| commitdiff \| raw
2013-07-30	Junio C Hamano	Merge branch 'bc/completion-for-bash-3.0'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'mh/multimail'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'es/contacts'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'ml/cygwin-updates'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'rj/sparse'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'sb/traverse-trees-bitmask-variable-name'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'jk/cat-file-batch-optim'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'ml/avoid-using-grep-on-crlf-files'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'jm/doc-ref-prune'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'rh/template-updates'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'mh/ref-races-optim-invalidate-cached'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'sb/misc-fixes'	blob \| commitdiff \| raw
2013-07-25	Junio C Hamano	Merge branch 'tr/line-log'	blob \| commitdiff \| raw
2013-07-23	Junio C Hamano	Merge branch 'mv/merge-ff-tristate'	blob \| commitdiff \| raw
2013-07-22	Junio C Hamano	Sync with Git 1.8.3.4	blob \| commitdiff \| raw
2013-07-22	Ondřej Bílka	update URL to the marc.info mail archive	blob \| commitdiff \| raw
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-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-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
2011-07-06	Junio C Hamano	Merge commit 'v1.6.0' into jc/checkout-reflog-fix	blob \| commitdiff \| raw \| diff to current
2011-04-11	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2011-03-26	Junio C Hamano	Merge git-gui 0.14.0	blob \| commitdiff \| raw \| diff to current
2010-12-14	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2010-11-05	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2010-09-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
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 'tr/xsize-bits'	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-05-21	Junio C Hamano	Merge branch 'jn/gitweb-our-squelch'	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 'rc/maint-reflog-msg-for-forced-branch'	blob \| commitdiff \| raw \| diff to current
2010-03-07	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 'gf/maint-sh-setup-nongit-ok' into maint	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-02-08	Junio C Hamano	Merge branch 'jc/maint-doc-git-add-example' into maint	blob \| commitdiff \| raw \| diff to current
2010-02-07	Junio C Hamano	Merge git://repo.or.cz/git-gui v1.7.0-rc2	blob \| commitdiff \| raw \| diff to current
2010-02-06	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2010-01-31	Junio C Hamano	Merge commit 'b319ef7' into jc/maint-fix-test-perm	blob \| commitdiff \| raw \| diff to current
2010-01-29	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2010-01-24	Junio C Hamano	Merge branch 'maint' of git://git.spearce.org/git-gui...	blob \| commitdiff \| raw \| diff to current
2009-12-27	Junio C Hamano	Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...	blob \| commitdiff \| raw \| diff to current
2009-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-12-09	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-10-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-09-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'maint-1.5.6' into maint-1.6.0	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-06-20	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-06-11	Junio C Hamano	Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom