merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t4014-format-patch.sh
2010-06-01 Merge branch 'maint-1.7.0' into maint
2010-05-28 Merge branch 'maint-1.7.0' into maint
2010-05-21 Merge branch 'cb/maint-stash-orphaned-file'
2010-05-21 Merge branch 'jn/maint-bundle'
2010-05-21 Merge branch 'rr/doc-submitting'
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jn/shortlog'
2010-05-21 Merge branch 'jn/t7006-fixup'
2010-05-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-05-21 Merge branch 'sp/maint-dumb-http-pack-reidx'
2010-05-21 Merge branch 'np/index-pack-memsave'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-05-21 Merge branch 'jc/maint-no-reflog-expire-unreach-for...
2010-05-21 Merge branch 'cw/maint-exec-defpath'
2010-05-21 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-05-21 Merge branch 'np/malloc-threading'
2010-05-21 Merge branch 'ld/discovery-limit-to-fs' (early part)
2010-05-21 Merge branch 'ar/config-from-command-line'
2010-05-21 Merge branch 'em/checkout-orphan'
2010-05-09 Merge branch 'bg/apply-blank-trailing-context'
2010-05-09 Merge branch 'bg/send-email-smtpdomain'
2010-05-09 Merge branch 'rc/maint-curl-helper'
2010-05-09 Merge branch 'hg/maint-attr-fix'
2010-05-09 Merge branch 'jc/maint-reflog-expire-unreachable'
2010-05-09 Merge branch 'sd/log-decorate'
2010-05-09 Merge branch 'cc/revert-strategy'
2010-05-09 Merge branch 'pc/remove-warn'
2010-05-08 Merge branch 'jn/maint-request-pull' into jn/request...
2010-05-04 Merge branch 'maint-1.7.0' into maint
2010-05-02 Merge branch 'maint'
2010-04-24 Merge branch 'maint'
2010-04-23 Sync with 1.7.0.6
2010-04-23 Merge branch 'mg/use-default-abbrev-length-in-rev-list...
2010-04-23 Merge branch 'jk/maint-diffstat-overflow' into maint
2010-04-23 Merge branch 'da/maint-python-startup' into maint
2010-04-22 Merge branch 'maint'
2010-04-20 Merge branch 'maint'
2010-04-19 Merge branch 'maint-1.6.6' into maint
2010-04-19 Merge branch 'wp/doc-filter-direction'
2010-04-19 Merge branch 'jk/maint-diffstat-overflow'
2010-04-19 Merge branch 'maint'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-17 Merge branch 'maint'
2010-04-14 Merge branch 'maint'
2010-04-11 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-11 Sync with 1.7.0.5
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-10 Merge branch 'maint'
2010-04-10 Merge branch 'ef/maint-empty-commit-log' into maint
2010-04-10 Merge branch 'jc/conflict-marker-size' into maint
2010-04-10 Merge branch 'sp/maint-http-backend-die-triggers-die...
2010-04-10 Merge branch 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Merge branch 'rr/imap-send-unconfuse-from-line' into...
2010-04-10 Merge branch 'rb/maint-python-path' into maint
2010-04-10 Merge branch 'gh/maint-stash-show-error-message' into...
2010-04-10 Merge branch 'mg/mailmap-update' into maint
2010-04-10 Merge branch 'bc/maint-daemon-sans-ss-family' into...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-09 Merge branch 'maint'
2010-04-07 Merge branch 'mg/notes-reflog'
2010-04-06 Merge branch 'da/maint-python-startup'
2010-04-06 Merge branch 'ic/bash-completion-rpm'
2010-04-06 Merge branch 'sb/fmt-merge-msg'
2010-04-06 Merge branch 'jc/conflict-marker-size'
2010-04-06 Merge branch 'ef/maint-empty-commit-log'
2010-04-06 Merge branch 'sg/bash-completion'
2010-04-04 Merge branch 'maint'
2010-04-03 Merge branch 'mb/rebase-i-no-ff'
2010-04-03 Merge branch 'sp/maint-http-backend-die-triggers-die...
2010-04-03 Merge branch 'rr/imap-send-unconfuse-from-line'
2010-04-03 Merge branch 'mg/use-default-abbrev-length-in-rev-list'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-04-03 Merge branch 'rb/maint-python-path'
2010-04-03 Merge branch 'jn/merge-diff3-label'
2010-04-03 Merge branch 'ef/cherry-abbrev'
2010-04-03 Merge branch 'bw/template-tool-buildconfig'
2010-04-03 Merge branch 'mg/mailmap-update'
2010-04-03 Merge branch 'bc/t5505-fix'
2010-04-03 Merge branch 'gh/maint-stash-show-error-message'
2010-04-03 Merge branch 'rs/threaded-grep-context'
2010-04-03 Merge branch 'bc/maint-daemon-sans-ss-family'
2010-04-03 Merge branch 'bc/acl-test'
2010-04-03 Merge branch 'ja/send-email-ehlo'
2010-04-03 Merge branch 'do/rebase-i-arbitrary'
2010-04-03 Merge branch 'ak/everyday-git'
2010-03-31 Sync with 1.7.0.4
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-30 Merge branch 'maint'
2010-03-30 format-patch: Squelch 'fatal: Not a range." error
2010-03-29 Merge branch 'cc/cherry-pick-ff'
2010-03-29 Merge branch 'sb/notes-parse-opt'
2010-03-29 Merge branch 'maint'
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
2010-03-29 Merge branch 'maint'
2010-03-24 Merge branch 'jh/maint-submodule-status-in-void'
2010-03-24 Merge branch 'tr/notes-display'
2010-03-24 Merge branch 'jl/submodule-diff-dirtiness'
2010-03-24 Merge branch 'pb/log-first-parent-p-m'
2010-03-24 Merge branch 'jc/maint-refs-dangling'
next