From bc8cdd52171d2b9cbe0daf52966ff71a0a194c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Guti=C3=A9rrez?= Date: Tue, 14 Dec 2021 15:15:23 +0100 Subject: [PATCH] git merge --no-ff added --- git.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.md b/git.md index 64d6cff..a6337d5 100644 --- a/git.md +++ b/git.md @@ -184,6 +184,8 @@ $ git fetch [alias] Merge a remote branch into your current branch to bring it up to date ``` shell script $ git merge [alias]/[branch] +// No fast-forward +$ git merge --no-ff [alias]/[branch] ``` Transmit local branch commits to the remote repository branch