diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-29 15:05:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 15:09:07 -0700 |
| commit | 67711cdc399203ec1d70cde2c3cd71e37e43da70 (patch) | |
| tree | ca6678b301627387cb345bf78d63d4645bc8ce83 /templates/hooks--pre-push.sample | |
| parent | rerere: report autoupdated paths only after actually updating them (diff) | |
| download | tgif-67711cdc399203ec1d70cde2c3cd71e37e43da70.tar.xz | |
rerere: drop want_sp parameter from is_cmarker()
As the nature of the conflict marker line determines if there should
be a SP and label after it, the caller shouldn't have to pass the
parameter redundantly.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'templates/hooks--pre-push.sample')
0 files changed, 0 insertions, 0 deletions