From: Antoine Pelisse Date: Sun, 30 Dec 2012 14:54:14 GMT Subject: Re: [PATCH 1/2] dir.c: Make git-status --ignored more consistent Message-ID: In-Reply-To: <1356878341-12942-1-git-send-email-apelisse@gmail.com> 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.