Fixes #1178: adds '--no-ff --no-commit' option to merge#1621
Fixes #1178: adds '--no-ff --no-commit' option to merge#1621eamodio merged 1 commit intogitkraken:mainfrom dimaulupov:main
Conversation
|
@dimaulupov I asked on the issue, but I think I'd rather see an option here just for |
|
@eamodio sorry for nor replying earlier. Main reason why I am reviewing other branches and merging them into main. Easiest way (for me at least) to review the code and see changes in overall is to use highlighting features for changes in vscode. It is possible to start the code, see what it does, etc. Quite often branches are not ready and I often reset my main branch after looking at the changes. It means I need to just apply changes from other branch, but not actually commit. |
|
@dimaulupov Thank you for the extra information -- very helpful! |

Description
This change just adds '--no-ff --no-commit' option to merge command.
I personally use it all the time to review the code.
Merge without commit, see problems, reset.
Issue for that #1178 was created some time ago, but it seems it did not get any traction.
Checklist
Fixes $XXX -orCloses #XXX -prefix to auto-close the issue that your PR addresses