diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:28:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:28:22 -0700 |
| commit | 3fcee259d023087184c63eedf1015be6e23ea6e1 (patch) | |
| tree | ab734962b5eb4883ed269bb2785e67322c504ced /builtin-merge-base.c | |
| parent | 6422c6af38747f008ebffc106f9a5799b26091d0 (diff) | |
| parent | aa9ea77de4fffd133b3da1d36a19fd0bd11ad368 (diff) | |
| download | git-3fcee259d023087184c63eedf1015be6e23ea6e1.tar.gz | |
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
Diffstat (limited to 'builtin-merge-base.c')
0 files changed, 0 insertions, 0 deletions