Remove filename from conflict markers
[gitweb.git] / t / t9139-git-svn-non-utf8-commitencoding.sh
2009-07-02 Merge branch 'cc/bisect'
2009-07-02 Merge branch 'cf/maint-remote-uploadpack-useconfig...
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-07-02 Merge branch 'maint'
2009-06-30 Merge branch 'maint'
2009-06-27 Merge branch 'maint'
2009-06-22 Merge branch 'maint'
2009-06-22 Sync with 1.6.3.3
2009-06-21 Merge branch 'maint'
2009-06-21 Merge branch 'ph/submodule-rebase'
2009-06-21 Merge branch 'jc/cache-tree'
2009-06-21 Merge branch 'mn/maint-iconv-autoconf'
2009-06-21 Merge branch 'pb/maint-1.6.2-userdiff-fix'
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-21 Merge branch 'lt/maint-unsigned-left-shift'
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-18 Merge branch 'maint'
2009-06-18 Merge branch 'ak/maint-for-each-ref-no-lookup'
2009-06-14 Merge branch 'maint'
2009-06-13 Merge branch 'rc/http-push'
2009-06-13 Merge branch 'cc/bisect' (early part)
2009-06-13 Merge branch 'rc/maint-http-local-slot-fix'
2009-06-13 Merge branch 'cb/maint-no-double-merge'
2009-06-13 Merge branch 'ph/submodule-rebase' (early part)
2009-06-13 Merge branch 'bc/solaris'
2009-06-13 Merge branch 'cb/match_refs_internal_tail'
2009-06-13 Merge branch 'nw/maint-cvsexportcommit'
2009-06-13 Merge branch 'da/araxis-mergetool'
2009-06-12 Merge branch 'mh/maint-fix-send-email-threaded' into...
2009-06-12 Merge branch 'maint'
2009-06-09 Merge branch 'maint'
2009-06-07 Merge branch 'maint'
2009-06-04 Merge branch 'maint' to sync with 1.6.3.2
2009-06-03 Merge branch 'da/pretty-tempname'
2009-06-03 Merge branch 'maint'
2009-05-31 Merge branch 'sb/opt-filename'
2009-05-31 Merge branch 'jc/solaris-0811'
2009-05-31 Merge branch 'sb/show-branch-parse-options'
2009-05-31 Merge branch 'mm/apply-double-slash'
2009-05-31 Merge branch 'sb/format-patch-parseopt'
2009-05-31 Merge branch 'jc/mktree'
2009-05-31 Merge branch 'ew/svn-test-and-old-i18n'
2009-05-31 Merge branch 'mw/send-email'
2009-05-31 Merge branch 'cc/bisect' (early part)
2009-05-31 t9139 uses ancient, backwards-compatible iconv names
2009-05-31 Merge git://git.bogomips.org/git-svn
2009-05-28 git-svn: refuse to dcommit non-UTF-8 messages