Re: Git makes a merge commit but as a normal (non-merge) commit

2017-08-21 Thread Michael J Gruber
hIpPy venit, vidit, dixit 19.08.2017 00:35: > While merging if I do certain actions then the merge commit is made > with the merge message but as a normal (non-merge) commit. > > Repro steps: > - Set GIT_MERGE_AUTOEDIT=yes (set other than "no") in .bashrc > - Make a merge commit with no conflicts.

Git makes a merge commit but as a normal (non-merge) commit

2017-08-18 Thread hIpPy
While merging if I do certain actions then the merge commit is made with the merge message but as a normal (non-merge) commit. Repro steps: - Set GIT_MERGE_AUTOEDIT=yes (set other than "no") in .bashrc - Make a merge commit with no conflicts. (external text editor shows the generated merge messa