m-lamonaca/dev-notes
1
0
Fork 0
mirror of https://github.com/m-lamonaca/dev-notes.git synced 2025-04-06 10:56:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add git pull -ff notes

Browse source
This commit is contained in:
Marcello 2021-06-19 11:20:46 +02:00
parent 395825ce8e
commit 085535d05e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Git/git.md
View file

@ -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