t7406-submodule-update: add missing &&
[gitweb.git] / t / t6021-merge-criss-cross.sh
2013-09-05 Merge branch 'hv/config-from-blob' into maint
2013-09-05 Merge branch 'maint-1.8.2' into maint-1.8.3
2013-09-03 Merge branch 'maint-1.8.2' into maint-1.8.3
2013-08-13 Merge branch 'sb/mailmap-updates'
2013-08-09 Merge branch 'jk/submodule-subdirectory-ok'
2013-08-09 Merge branch 'sb/mailmap-updates'
2013-08-05 Merge branch 'es/blame-L-breakage'
2013-08-05 Merge branch 'sb/mailmap-updates'
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-08-05 Merge branch 'bc/commit-invalid-utf8'
2013-08-02 Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'
2013-08-02 Merge branch 'jk/cat-file-batch-optim'
2013-08-01 Merge branch 'jc/rm-submodule-error-message'
2013-08-01 Merge branch 'lf/echo-n-is-not-portable'
2013-08-01 Merge branch 'jx/clean-interactive'
2013-07-31 Merge branch 'rr/rebase-autostash'
2013-07-31 Merge branch 'rj/commit-slab-fix'
2013-07-31 Merge branch 'jk/commit-how-to-abort-cherry-pick'
2013-07-31 Merge branch 'ds/doc-two-kinds-of-tags'
2013-07-31 Merge branch 'mh/packed-refs-do-one-ref-recursion'
2013-07-30 Merge branch 'jk/capabilities-doc'
2013-07-30 Merge branch 'sb/mailmap-updates'
2013-07-30 Merge branch 'bc/completion-for-bash-3.0'
2013-07-25 Merge branch 'mh/multimail'
2013-07-25 Merge branch 'es/contacts'
2013-07-25 Merge branch 'ml/cygwin-updates'
2013-07-25 Merge branch 'rj/sparse'
2013-07-25 Merge branch 'sb/traverse-trees-bitmask-variable-name'
2013-07-25 Merge branch 'jk/cat-file-batch-optim'
2013-07-25 Merge branch 'ml/avoid-using-grep-on-crlf-files'
2013-07-25 Merge branch 'jm/doc-ref-prune'
2013-07-25 Merge branch 'rh/template-updates'
2013-07-25 Merge branch 'mh/ref-races-optim-invalidate-cached'
2013-07-25 Merge branch 'sb/misc-fixes'
2013-07-25 Merge branch 'tr/line-log'
2013-07-23 Merge branch 'mv/merge-ff-tristate'
2013-07-22 Sync with Git 1.8.3.4
2013-07-22 update URL to the marc.info mail archive
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02 Merge branch 'pt/gitk'
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2011-12-17 Merge git://ozlabs.org/~paulus/gitk
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui
2011-11-23 Merge branch 'maint' into tj/imap-send-remove-unused
2011-11-10 Merge 'build-in git-mktree'
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint
2011-10-21 Merge branch 'jc/maint-remove-renamed-ref'
2011-10-16 Merge git://repo.or.cz/git-gui
2011-07-06 Merge commit 'v1.6.0' into jc/checkout-reflog-fix
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2011-03-26 Merge git-gui 0.14.0
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-09-15 Merge git://repo.or.cz/git-gui
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-10-27 Merge git://repo.or.cz/git-gui
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
next