![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Mar 2009 07:28:22 +0000 (00:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Mar 2009 07:28:22 +0000 (00:28 -0700) | ||
| commit | 3fcee259d023087184c63eedf1015be6e23ea6e1 | |
| tree | ab734962b5eb4883ed269bb2785e67322c504ced | tree | snapshot |
| parent | 6422c6af38747f008ebffc106f9a5799b26091d0 | commit | diff |
| parent | aa9ea77de4fffd133b3da1d36a19fd0bd11ad368 | commit | diff |
Merge branch 'jc/maint-1.6.0-blame-s'
* 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 | | blob | history |