From f650f7ab14cb425a3b19ddd41f4f92f80813f651 Mon Sep 17 00:00:00 2001 From: dgutierrez Date: Thu, 23 Dec 2021 15:36:34 +0100 Subject: [PATCH 1/2] ff only added --- git.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git.md b/git.md index ea36f0f..708aab9 100644 --- a/git.md +++ b/git.md @@ -186,6 +186,8 @@ Merge a remote branch into your current branch to bring it up to date $ git merge [alias]/[branch] // No fast-forward $ git merge --no-ff [alias]/[branch] +// Only fast-forward +$ git merge --ff-only [alias]/[branch] ``` Transmit local branch commits to the remote repository branch From b2866de9dc9c36cfabc8a61570b9bfff578b9cd0 Mon Sep 17 00:00:00 2001 From: deividgp Date: Thu, 23 Dec 2021 15:41:38 +0100 Subject: [PATCH 2/2] Comments fixed --- git.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git.md b/git.md index 708aab9..2850eb7 100644 --- a/git.md +++ b/git.md @@ -150,6 +150,7 @@ $ git tag my_tag ``` + ### Observe your Repository Show the commit history for the currently active branch ``` shell script @@ -184,9 +185,9 @@ $ 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 +# No fast-forward $ git merge --no-ff [alias]/[branch] -// Only fast-forward +# Only fast-forward $ git merge --ff-only [alias]/[branch] ```