Submodules: Don't parse .gitmodules when it contains, merge conflicts
[gitweb.git] / t / t7604-merge-custom-message.sh
2010-06-22 Merge branch 'jn/document-rebase-i-p-limitation' into...
2010-06-22 Merge branch 'jn/checkout-doc' into maint
2010-06-22 Merge branch 'cc/maint-diff-CC-binary' into maint
2010-06-22 Merge branch 'jc/t9129-any-utf8' into maint
2010-06-22 Merge branch 'cb/ls-files-cdup' into maint
2010-06-22 Merge branch 'tc/merge-m-log' into maint
2010-06-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-06-21 Merge branch 'cc/maint-commit-reflog-msg'
2010-06-21 Merge branch 'ic/maint-rebase-i-abort'
2010-06-21 Merge branch 'jk/maint-advice-empty-amend'
2010-06-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
2010-06-21 Merge branch 'sm/branch-broken-ref'
2010-06-21 Merge branch 'rr/parse-date-refactor'
2010-06-21 Merge branch 'jn/document-rebase-i-p-limitation'
2010-06-21 Merge branch 'tc/commit-abbrev-fix'
2010-06-21 Merge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21 Merge branch 'gs/usage-to-stdout'
2010-06-21 Merge branch 'js/async-thread'
2010-06-21 Merge branch 'gv/portable'
2010-06-21 Merge branch 'bc/portable'
2010-06-21 Merge branch 'jn/gitweb-fastcgi'
2010-06-21 Merge branch 'jn/checkout-doc'
2010-06-21 Merge branch 'em/checkout-orphan'
2010-06-21 Merge branch 'maint'
2010-06-21 Merge branch 'maint'
2010-06-18 Merge branch 'cc/maint-diff-CC-binary'
2010-06-18 Merge branch 'by/diff-graph'
2010-06-18 Merge branch 'cb/ls-files-cdup'
2010-06-18 Merge branch 'jc/t9129-any-utf8'
2010-06-18 Merge branch 'rr/am-help'
2010-06-18 Merge branch 'jn/rebase-cmdline-fix'
2010-06-18 Merge branch 'ps/gitweb--browse-chrome'
2010-06-18 Merge branch 'jk/am-skip-hint'
2010-06-18 Merge branch 'jh/diff-index-line-abbrev'
2010-06-18 Merge branch 'ab/maint-perl-use-instlibdir'
2010-06-18 Merge branch 'ec/diff-noprefix-config'
2010-06-18 Merge branch 'mg/status-b'
2010-06-18 Merge branch 'jn/gitweb-plackup'
2010-06-18 Merge branch 'jk/url-decode'
2010-06-18 Merge branch 'jn/remote-set-branches'
2010-06-18 Merge branch 'rc/ls-remote-default'
2010-06-18 Merge branch 'hg/id-munging'
2010-06-18 Merge branch 'tc/merge-m-log'
2010-06-16 Merge branch 'jc/am-3-show-corrupted-patch' into maint
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-05-10 merge: --log appends shortlog to message if specified
2010-05-10 t7604-merge-custom-message: show that --log doesn't...
2010-05-10 t7604-merge-custom-message: shift expected output creation
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 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-07 Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07 Merge branch 'rs/optim-text-wrap' into maint-1.6.6
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'rs/optim-text-wrap' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-03 Merge branch 'jc/maint-fix-test-perm' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'rs/optim-text-wrap'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-21 Merge branch 'jc/maint-fix-test-perm'
2010-02-19 Merge branch 'jk/maint-rmdir-fix' into maint
2010-02-10 Merge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-09 Merge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
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-27 Merge branch 'jh/maint-config-file-prefix'
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-21 Merge branch 'jc/checkout-merge-base'
2010-01-21 Merge branch 'ap/merge-backend-opts'
2010-01-20 Merge branch 'bg/maint-remote-update-default' into...
2010-01-19 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-13 Merge branch 'jc/checkout-merge-base'
2010-01-13 Merge branch 'nd/sparse'
2010-01-12 Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10 Merge branch 'tr/http-updates'
2010-01-10 Merge branch 'bg/maint-remote-update-default'
next