Remove filename from conflict markers
[gitweb.git] / t / t5100 / info0012
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-03 Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-09 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Merge branch 'jc/maint-1.6.0-keep-pack' into maint
2009-04-09 Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-09 Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-02 Merge branch 'jc/maint-1.6.0-blame-s' into maint
2009-04-02 Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-02 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-28 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-26 Merge branch 'jc/maint-1.6.0-blame-s'
2009-03-26 Merge branch 'bc/maint-1.6.1-branch-deleted-was'
2009-03-22 Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
2009-03-22 Merge branch 'mg/maint-submodule-normalize-path' into...
2009-03-22 Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-22 Merge branch 'js/maint-1.6.0-path-normalize' into maint...
2009-03-22 Merge branch 'jc/maint-1.6.0-pack-directory' into maint...
2009-03-18 Merge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-18 Merge branch 'tr/maint-1.6.0-send-email-irt'
2009-03-13 Merge branch 'en/maint-1.6.1-hash-object' into maint...
2009-03-13 Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-13 Merge branch 'js/maint-1.6.1-filter-branch-submodule...
2009-03-13 Merge branch 'gt/maint-1.6.1-utf8-width' into maint...
2009-03-13 Merge branch 'js/maint-1.6.1-remote-remove-mirror'...
2009-03-13 Merge branch 'ek/maint-1.6.1-filter-branch-bare' into...
2009-03-13 Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted...
2009-03-13 Merge branch 'js/maint-1.6.1-rebase-i-submodule' into...
2009-03-13 Merge branch 'jc/maint-1.6.1-allow-uninteresting-missin...
2009-03-13 Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-11 Merge branch 'fg/maint-exclude-bq' into maint
2009-03-11 Merge branch 'en/maint-hash-object' into maint
2009-03-11 Merge branch 'mg/maint-submodule-normalize-path'
2009-03-11 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-08 Merge branch 'maint-1.6.1' into maint
2009-03-05 Merge branch 'en/maint-hash-object'
2009-03-05 Merge branch 'jc/blame'
2009-03-05 Merge branch 'fg/exclude-bq'
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-01 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-28 Merge branch 'maint'
2009-02-28 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-27 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-25 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-20 Merge branch 'maint'
2009-02-18 Merge branch 'maint'
2009-02-15 Merge branch 'rc/http-push'
2009-02-12 Merge branch 'maint'
2009-02-11 Merge branch 'maint'
2009-02-11 Merge branch 'js/maint-1.6.0-path-normalize'
2009-02-11 Merge branch 'maint'
2009-02-09 Merge branch 'maint'
2009-02-07 Merge branch 'js/filter-branch-submodule'
2009-02-07 Merge branch 'maint'
2009-02-06 Merge branch 'js/maint-remote-remove-mirror'
2009-02-06 Merge branch 'js/notes'
2009-02-06 Merge branch 'jc/refuse-push-to-current'
2009-02-06 Merge branch 'rc/http-push'
2009-02-06 Merge branch 'gt/utf8-width'
2009-02-06 Merge branch 'jk/head-symref'
2009-02-06 Merge branch 'cb/mergetool'
2009-02-06 Merge branch 'maint'
2009-02-05 Merge branch 'jc/fsck' (early part)
2009-02-04 Merge branch 'maint'
2009-02-04 Merge branch 'ns/am-slacker'
2009-02-04 Merge branch 'maint'
2009-02-03 Merge branch 'maint'
2009-02-03 Merge branch 'jc/maint-add-u-remove-conflicted'
2009-02-03 Merge branch 'jk/maint-cleanup-after-exec-failure'
2009-02-01 Merge branch 'ks/maint-mailinfo-folded'
2009-01-11 mailinfo: correctly handle multiline 'Subject:' header