commit | bb11eb31a2e7da7f878dd501d39f6877ec00eb7d | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Apr 08 23:02:17 2009 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Apr 08 23:02:17 2009 -0700 |
tree | 4522f1b81040585f03b586200340e8bf7586bf46 | |
parent | 1c9f54417e22103a04c51293369a48b6d3386ac4 [diff] | |
parent | aa9ea77de4fffd133b3da1d36a19fd0bd11ad368 [diff] |
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1 * jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c