Re: [PATCH] reset: --unmerge

2016-10-27 Thread Junio C Hamano
Andreas Schwab writes: > On Okt 25 2016, Junio C Hamano wrote: > >> Somebody with a bright idea decided that vc-git-resolve-conflicts >> variable should be on by default in Emacs 25.1 X-< > > This is consistent with the behaviour of the other VC backends, where it > isn't even customizable. The

Re: [PATCH] reset: --unmerge

2016-10-27 Thread Andreas Schwab
On Okt 25 2016, Junio C Hamano wrote: > Somebody with a bright idea decided that vc-git-resolve-conflicts > variable should be on by default in Emacs 25.1 X-< This is consistent with the behaviour of the other VC backends, where it isn't even customizable. Andreas. -- Andreas Schwab, sch...@l

Re: [PATCH] reset: --unmerge

2016-10-26 Thread Junio C Hamano
Duy Nguyen writes: > Interestingly the thread/bug that resulted in that commit started with > "report this bug to git" [2]. Something about git-stash. I quote the > original mail here in case anyone wants to look into it (not sure if > it's actually reported here before, I don't pay much attentio

Re: [PATCH] reset: --unmerge

2016-10-26 Thread Duy Nguyen
On Wed, Oct 26, 2016 at 6:28 AM, Junio C Hamano wrote: > Somebody with a bright idea decided that vc-git-resolve-conflicts > variable should be on by default in Emacs 25.1 X-<, Oh good, I have an excuse to stick to 24.5.1 for a while longer then. > which causes > "save" after resolving conflict

Re: [PATCH] reset: --unmerge

2016-10-25 Thread Junio C Hamano
Duy Nguyen writes: > BTW making git-add (and "git commit -a") refuse files with conflict > markers present could prevent this mistake earlier and is probably a > better option because the user won't have to discover 'reset > --unmerge'. That may help some users, but you are solving a different p

Re: [PATCH] reset: --unmerge

2016-10-25 Thread Sergey Organov
Junio C Hamano writes: > The procedure to resolve a merge conflict typically goes like this: > > - first open the file in the editor, and with the help of conflict >markers come up with a resolution. > > - save the file. > > - look at the output from "git diff" to see the combined diff to

Re: [PATCH] reset: --unmerge

2016-10-25 Thread Duy Nguyen
On Tue, Oct 25, 2016 at 6:06 PM, Duy Nguyen wrote: > On Tue, Oct 25, 2016 at 6:10 AM, Junio C Hamano wrote: >> The procedure to resolve a merge conflict typically goes like this: >> >> - first open the file in the editor, and with the help of conflict >>markers come up with a resolution. >>

Re: [PATCH] reset: --unmerge

2016-10-25 Thread Duy Nguyen
On Tue, Oct 25, 2016 at 6:10 AM, Junio C Hamano wrote: > The procedure to resolve a merge conflict typically goes like this: > > - first open the file in the editor, and with the help of conflict >markers come up with a resolution. > > - save the file. > > - look at the output from "git dif

[PATCH] reset: --unmerge

2016-10-24 Thread Junio C Hamano
The procedure to resolve a merge conflict typically goes like this: - first open the file in the editor, and with the help of conflict markers come up with a resolution. - save the file. - look at the output from "git diff" to see the combined diff to double check if the resolution make