Re: [git-users] Changes made by "git commit --amend" against merged commit were lost when executing squash rebase

2019-10-20 Thread Benjamin
Thanks for the info. Neither "--rebase-merges" nor "--preserve-merges" can prevent the changes made by "git commit --amend" against merge commit from being lost. The only solution to recover the lost code is to make use of "git reflog". 在 2019年10月18日星期五 UTC+8下午5:36:08,Mikko Rantalainen写道: >

[git-users] Re: Getting git-bash to work in a Windows Terminal ?

2019-10-20 Thread Philip Oakley
Hi Christopher, I (personally) am also trying to get my head around the terminal awkwardness. Have a look at https://groups.google.com/forum/#!msg/git-for-windows/o4vIpvIEWhE/pbp9-dHqBgAJ https://github.com/git-for-windows/git/issues/1674

[git-users] Getting git-bash to work in a Windows Terminal ?

2019-10-20 Thread CrestChristopher
Hi, I’m having an issue with git-bash; and I hope someone can help. When I’m in command (DOS) in Windows, I can change between DOS and Powershell by simply typing in either |cmd| or |powershell| and my shell changes. Since I’m using another terminal, rather then the default Windows command