| commit | 66f8b961cc96b0b15d60af597a53df3f7a833024 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Mar 2009 07:34:45 +0000 (23 00:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Mar 2009 07:34:45 +0000 (23 00:34 -0700) | ||
| tree | 587004e5d8c5b08d49c64fa87eb6578338e1e401 | treesnapshot (tar.gz zip) |
| parent | 842c0051e70a8016ba13bd0bdd708a73a8dd678b | commitdiff |
| parent | aa9ea77de4fffd133b3da1d36a19fd0bd11ad368 | commitdiff |
Merge branch 'jc/maint-1.6.0-blame-s' into next
* jc/maint-1.6.0-blame-s:
blame: read custom grafts given by -S before calling setup_revisions()
Conflicts:
builtin-blame.c
* 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 | diff1 | diff2 | blobhistory |