more D/F conflict tests
[gitweb.git] / builtin-mailsplit.c
2009-09-16 Merge branch 'jk/maint-1.6.3-checkout-unborn' into...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-14 Merge branch 'maint'
2009-09-13 Merge branch 'pk/fast-import-tars'
2009-09-13 Merge branch 'pk/fast-import-dirs'
2009-09-13 Merge branch 'jt/pushinsteadof'
2009-09-13 Merge branch 'jk/unwanted-advices'
2009-09-13 Merge branch 'jc/merge-saner-messages'
2009-09-13 don't dereference NULL upon fdopen failure
2009-09-13 Merge branch 'db/vcs-helper'
2009-09-13 Merge branch 'maint'
2009-09-13 Merge branch 'cb/maint-1.6.3-grep-relative-up' into...
2009-09-07 Merge branch 'maint'
2009-09-07 Merge branch 'tr/reset-checkout-patch'
2009-09-07 Merge branch 'np/maint-1.6.3-deepen'
2009-09-06 Merge branch 'maint'
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-01 Merge branch 'mr/gitweb-snapshot'
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Sync with 1.6.4.2
2009-08-29 Merge branch 'mm/reset-report'
2009-08-29 Merge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29 Merge branch 'np/maint-1.6.3-deepen'
2009-08-29 Merge branch 'jc/shortstatus'
2009-08-29 Merge branch 'maint'
2009-08-28 Merge branch 'maint'
2009-08-28 Merge branch 'maint-1.6.3' into maint
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-28 Merge branch 'lt/block-sha1'
2009-08-27 Merge branch 'as/maint-graph-interesting-fix'
2009-08-27 Merge branch 'jh/submodule-foreach'
2009-08-27 Merge branch 'jc/maint-unpack-objects-strict'
2009-08-27 Merge branch 'wl/insta-mongoose'
2009-08-27 Merge branch 'nd/sparse' (early part)
2009-08-26 Merge branch 'maint'
2009-08-26 Merge branch 'maint-1.6.3' into maint
2009-08-25 Merge branch 'aj/fix-read-tree-from-scratch'
2009-08-25 Merge branch 'jc/maint-checkout-index-to-prefix'
2009-08-25 Merge branch 'jl/submodule-summary-diff-files'
2009-08-25 Merge branch 'lh/short-decorate'
2009-08-25 Merge branch 'oa/stash-na'
2009-08-24 Merge branch 'jc/verify-pack-stat'
2009-08-24 Merge branch 'mr/gitweb-xz'
2009-08-24 Merge branch 'ld/p4'
2009-08-22 Sync with 1.6.4.1
2009-08-22 Merge branch 'cc/replace'
2009-08-22 Merge branch 'gb/apply-ignore-whitespace'
2009-08-22 Merge branch 'bc/mailsplit-cr-at-eol'
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-12 Merge branch 'maint-1.6.3' into maint
2009-08-11 Merge branch 'maint-1.6.3' into maint
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-11 Merge branch 'js/run-command-updates'
2009-08-08 Merge branch 'maint-1.6.3' into maint
2009-08-05 Merge branch 'sb/read-tree'
2009-08-05 Merge branch 'ne/futz-upload-pack'
2009-08-05 Merge branch 'maint-1.6.3' into maint
2009-08-05 Allow mailsplit (and hence git-am) to handle mails...
2009-08-05 builtin-mailsplit.c: remove read_line_with_nul() since...
2009-08-05 builtin-mailinfo,builtin-mailsplit: use strbufs
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-29 Sync with 1.6.3.4
2009-07-26 Merge branch 'gp/maint-rebase-p-onto'
2009-07-26 Merge branch 'en/fast-export'
2009-07-25 Merge branch 'maint'
2009-07-25 Merge branch 'maint'
2009-07-25 Merge branch 'js/maint-graft-unhide-true-parents'
2009-07-25 Merge branch 'av/maint-config-reader'
2009-07-25 Merge branch 'jk/maint-send-email-alias-loop'
2009-07-24 Merge branch 'maint'
2009-07-23 Merge branch 'maint'
2009-07-18 Merge branch 'maint'
2009-07-11 Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'
2009-07-09 Merge branch 'ld/push-porcelain-output-format'
2009-07-09 Merge branch 'gb/gitweb-avatar'
2009-07-09 Merge branch 'ml/http'
2009-07-09 Merge branch 'rs/grep-p'
2009-07-09 Merge branch 'js/run-command-updates' (early part)
2009-07-08 Merge branch 'maint'
2009-07-06 Merge branch 'tr/die_errno'
2009-06-27 Use die_errno() instead of die() when checking syscalls
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-02-11 Merge branch 'maint-1.5.5' into maint-1.5.6
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
2009-01-03 Merge branch 'ap/maint-apply-modefix'
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
next