Re: show all merge conflicts

2017-02-27 Thread Jeff King
On Mon, Feb 27, 2017 at 11:45:31AM -0800, Junio C Hamano wrote: > Michael J Gruber writes: > > > If you're curious, I kept rebasing Thomas' remerge-diff (on top of our > > next) so far. You can find it at > > > > https://github.com/mjg/git/tree/remerge-diff > > ;-).

Re: show all merge conflicts

2017-02-27 Thread Junio C Hamano
Michael J Gruber writes: > If you're curious, I kept rebasing Thomas' remerge-diff (on top of our > next) so far. You can find it at > > https://github.com/mjg/git/tree/remerge-diff ;-). Yes, this was a good one. > if you're interested. I don't know what problems

Re: show all merge conflicts

2017-02-27 Thread Michael J Gruber
G. Sylvie Davies venit, vidit, dixit 29.01.2017 07:45: > On Sat, Jan 28, 2017 at 6:28 AM, Jeff King wrote: >> On Fri, Jan 27, 2017 at 09:42:41PM -0800, G. Sylvie Davies wrote: >> >>> Aside from the usual "git log -cc", I think this should work (replace >>> HEAD with whichever

Re: show all merge conflicts

2017-01-29 Thread G. Sylvie Davies
On Sat, Jan 28, 2017 at 6:28 AM, Jeff King wrote: > On Fri, Jan 27, 2017 at 09:42:41PM -0800, G. Sylvie Davies wrote: > >> Aside from the usual "git log -cc", I think this should work (replace >> HEAD with whichever commit you are analyzing): >> >> git diff --name-only

Re: show all merge conflicts

2017-01-28 Thread Jeff King
On Fri, Jan 27, 2017 at 09:42:41PM -0800, G. Sylvie Davies wrote: > Aside from the usual "git log -cc", I think this should work (replace > HEAD with whichever commit you are analyzing): > > git diff --name-only HEAD^2...HEAD^1 > m1 > git diff --name-only HEAD^1...HEAD^2 > b1 > git diff

Re: show all merge conflicts

2017-01-28 Thread Philip Oakley
From: "G. Sylvie Davies" On Fri, Jan 27, 2017 at 9:51 AM, Jeff King wrote: On Fri, Jan 27, 2017 at 11:56:08AM -0500, Michael Spiegel wrote: I'm trying to determine whether a merge required a conflict to resolve after the merge has occurred. The git

Re: show all merge conflicts

2017-01-27 Thread G. Sylvie Davies
On Fri, Jan 27, 2017 at 9:51 AM, Jeff King wrote: > On Fri, Jan 27, 2017 at 11:56:08AM -0500, Michael Spiegel wrote: > >> I'm trying to determine whether a merge required a conflict to resolve >> after the merge has occurred. The git book has some advice >>

Re: show all merge conflicts

2017-01-27 Thread Jeff King
On Fri, Jan 27, 2017 at 11:56:08AM -0500, Michael Spiegel wrote: > I'm trying to determine whether a merge required a conflict to resolve > after the merge has occurred. The git book has some advice > (https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging) to use > `git show` on the merge

show all merge conflicts

2017-01-27 Thread Michael Spiegel
Hi folks, I'm trying to determine whether a merge required a conflict to resolve after the merge has occurred. The git book has some advice (https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging) to use `git show` on the merge commit or use `git log --cc -p -1`. These strategies work when the