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

2017-08-21 Thread Michael J Gruber
rge commit with no conflicts. > (external text editor shows the generated merge message) > - Focus on Git Bash and Ctrl-C. > - Commit (git commit). > > Actual behavior: > Git makes a normal (non-merge) commit (squash merge) but with the > merge commit message. > >

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

2017-08-18 Thread hIpPy
ated merge message) - Focus on Git Bash and Ctrl-C. - Commit (git commit). Actual behavior: Git makes a normal (non-merge) commit (squash merge) but with the merge commit message. It looks like a bug to me. This is very confusing later on as the repo topology would show that the branch is