Christian Couder chrisc...@tuxfamily.org writes:
Make sure we look for trailers before any conflict line
by reusing the ignore_non_trailer() function.
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
It makes sense to unify the logic
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore
conflict lines
Date: Mon, 10 Nov 2014 09:49:34 -0800
Christian Couder chrisc...@tuxfamily.org writes:
Make sure we look for trailers before any conflict line
by reusing
Christian Couder chrisc...@tuxfamily.org writes:
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore
conflict lines
Date: Mon, 10 Nov 2014 09:49:34 -0800
Christian Couder chrisc...@tuxfamily.org writes:
Make sure we look
Make sure we look for trailers before any conflict line
by reusing the ignore_non_trailer() function.
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t7513-interpret-trailers.sh | 2 ++
trailer.c | 32
4 matches
Mail list logo