From: Junio C Hamano Date: Sun, 30 Dec 2012 21:36:35 GMT Subject: Re: [PATCH 1/2] dir.c: Make git-status --ignored more consistent Message-ID: <7v623jfcik.fsf@alter.siamese.dyndns.org> In-Reply-To: Antoine Pelisse writes: > By the way, that merges without conflicts with Adam's series, but it > will not compile as he renamed functions that I'm now using > (path_excluded() -> is_path_excluded() that is). > > By the way, Junio, how do you handle this situation as a maintainer ? > Do you keep a note to manually make the change every time you remerge > the series together ? That is the kind of use-case you can't handle > with git-rerere, and I've been trying to find a solution to it. I'll finish the write-up on jc/doc-maintainer topic not in a very distant future, but not today. In the meantime, the hint is in the use of refs/merge-fix/ hierarchy in the Reintegrate script found on my 'todo' branch (which I have a separate clone/checkout of in "Meta/" directory in my main working tree).