]> git.ipfire.org Git - thirdparty/git.git/commit - trailer.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8c38458) | patch
trailer: reuse ignore_non_trailer() to ignore conflict lines
authorChristian Couder <chriscool@tuxfamily.org>
Sun, 9 Nov 2014 09:23:42 +0000 (10:23 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 18:00:02 +0000 (10:00 -0800)
commit61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc
tree75f68e68c37708205075003845e1ff8566fd1ef9tree | snapshot
parent8c3845892363abf3fb5cf2fe61bc455554f50c68commit | diff
trailer: reuse ignore_non_trailer() to ignore conflict lines

Make sure we look for trailers before any conflict line
by reusing the ignore_non_trailer() function.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7513-interpret-trailers.sh diff | blob | blame | history
trailer.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.