builtin-merge: show user-friendly error messages for fast-forward too.
[gitweb.git] / t / t6015-rev-list-show-all-parents.sh
2009-10-09 Merge branch 'rs/maint-archive-prefix'
2009-10-09 Merge branch 'maint'
2009-10-08 Merge branch 'maint'
2009-10-04 Merge branch 'maint'
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-20 Merge branch 'maint'
2009-09-16 Merge 1.6.4.4 in
2009-09-14 Merge branch 'maint'
2009-09-13 Merge branch 'db/vcs-helper'
2009-09-13 Merge branch 'maint'
2009-09-07 Merge branch 'maint'
2009-09-07 Merge branch 'jc/mailinfo-scissors'
2009-09-07 Merge branch 'jk/clone-b'
2009-09-07 Merge branch 'jc/upload-pack-hook'
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'
2009-09-01 Merge branch 'lt/approxidate'
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 'lt/block-sha1'
2009-08-27 Merge branch 'as/maint-graph-interesting-fix'
2009-08-21 graph API: fix bug in graph_is_interesting()