From 085535d05ed3885d0a58ad20df03d68c0e206f1c Mon Sep 17 00:00:00 2001
From: Marcello Lamonaca <marcello@lamonaca.eu>
Date: Sat, 19 Jun 2021 11:20:46 +0200
Subject: [PATCH] Add `git pull -ff` notes

---
 Git/git.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Git/git.md b/Git/git.md
index eb21d74..02bba8f 100644
--- a/Git/git.md
+++ b/Git/git.md
@@ -137,7 +137,8 @@ def load_reference(name_or_id):
 `git push <remote> <local branch>:<remote branch>`: send objects to remote, and update remote reference
 
 `git fetch [<remote>]`: retrieve objects/references from a remote  
-`git pull`: update the local branch with updates from its remote counterpart, same as `git fetch; git merge`
+`git pull`: update the local branch with updates from its remote counterpart, same as `git fetch; git merge`  
+`git pull -ff`: when possible resolve the merge as a fast-forward (only update branch pointer, don't create merge commit). Otherwise create a merge commit.  
 
 `git fetch && git show <remote>/<branch>`: show incoming changes