Merge branch 'jc/maint-1.6.0-blame-s' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 19:14:37 +0000 (12:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 19:14:37 +0000 (12:14 -0700)
commit5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005
tree1888b316163a5c96efc874a3d8f40b219a2af0e0
parentcb365a7a564152662e3f9c5b9a92e37aaf726ed9
parentaa9ea77de4fffd133b3da1d36a19fd0bd11ad368
Merge branch 'jc/maint-1.6.0-blame-s' into maint

* jc/maint-1.6.0-blame-s:
  blame: read custom grafts given by -S before calling setup_revisions()

Conflicts:
builtin-blame.c
builtin-blame.c