Re: [RFC] improving advice message from "git commit" during a merge

2014-08-28 Thread Junio C Hamano
Stefan Beller writes: > On 27.08.2014 20:23, Junio C Hamano wrote: >> I am not doing this myself soon, though. Hint, hint... > > I asked once upon a time, if there was a place, > which collects such topics for casual contributors and new comers. > > Would you mind to update the leftover bits at

Re: [RFC] improving advice message from "git commit" during a merge

2014-08-28 Thread Stefan Beller
On 27.08.2014 20:23, Junio C Hamano wrote: > I am not doing this myself soon, though. Hint, hint... I asked once upon a time, if there was a place, which collects such topics for casual contributors and new comers. Would you mind to update the leftover bits at http://git-blame.blogspot.de/searc

Re: [RFC] improving advice message from "git commit" during a merge

2014-08-27 Thread Junio C Hamano
Jeff King writes: >> - When all the unmerged paths have their conflicts resolved in the >>working tree, we do not have to say "Fix them up in the work >>tree,". We can instead say "You seem to have fixed them up in >>the work tree already," or something. > > How are you determining

Re: [RFC] improving advice message from "git commit" during a merge

2014-08-27 Thread Jeff King
On Wed, Aug 27, 2014 at 11:23:08AM -0700, Junio C Hamano wrote: > When there are unmerged paths, you would often get something like > this: > > [git.git (pu|MERGING]$ git commit > U copy.c > U wrapper.c > error: commit is not possible because you have unmerged files. >

[RFC] improving advice message from "git commit" during a merge

2014-08-27 Thread Junio C Hamano
When there are unmerged paths, you would often get something like this: [git.git (pu|MERGING]$ git commit U copy.c U wrapper.c error: commit is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as