diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:24 -0800 |
| commit | 0ed8a4e161c06b82734f5f5268a5b1fb68abb954 (patch) | |
| tree | 3adfc815939e2ce7688b69d3463cdb9b19dca5ab /builtin/grep.c | |
| parent | Sync with v2.2.1 (diff) | |
| parent | trailer: add test with an old style conflict block (diff) | |
| download | tgif-0ed8a4e161c06b82734f5f5268a5b1fb68abb954.tar.xz | |
Merge branch 'cc/interpret-trailers-more'
"git interpret-trailers" learned to properly handle the
"Conflicts:" block at the end.
* cc/interpret-trailers-more:
trailer: add test with an old style conflict block
trailer: reuse ignore_non_trailer() to ignore conflict lines
commit: make ignore_non_trailer() non static
merge & sequencer: turn "Conflicts:" hint into a comment
builtin/commit.c: extract ignore_non_trailer() helper function
merge & sequencer: unify codepaths that write "Conflicts:" hint
builtin/merge.c: drop a parameter that is never used
Diffstat (limited to 'builtin/grep.c')
0 files changed, 0 insertions, 0 deletions