checkout -m --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t3306-notes-prune.sh
2010-03-20 Merge branch 'jk/maint-add-ignored-dir'
2010-03-20 Merge branch 'ml/color-grep'
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-20 Merge branch 'cc/reset-keep'
2010-03-20 Merge branch 'fl/askpass'
2010-03-20 Merge branch 'bg/apply-fix-blank-at-eof'
2010-03-20 Merge branch 'bw/union-merge-refactor'
2010-03-20 Merge branch 'maint'
2010-03-17 Merge branch 'maint'
2010-03-17 Merge branch 'maint'
2010-03-15 Merge branch 'sd/format-patch-to'
2010-03-15 Merge branch 'tc/http-cleanup'
2010-03-15 Merge branch 'tc/transport-verbosity'
2010-03-15 Merge branch 'ld/push-porcelain'
2010-03-15 Merge branch 'jh/notes'
2010-02-14 builtin-notes: Deprecate the -m/-F options for "git...
2010-02-14 builtin-notes: Add "prune" subcommand for removing...