Merge pull request #122 from deividgp/main

--ff-only added and comments fixed
This commit is contained in:
Randy8080 authored and GitHub committed 2021-12-24 08:53:41 +08:00
commit 6a90d76ce3
1 file changed
+4 -1
+4 -1
View File
@@ -150,6 +150,7 @@ $ git tag my_tag
```
### Observe your Repository
Show the commit history for the currently active branch
``` shell script
@@ -184,8 +185,10 @@ $ 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
$ git merge --ff-only [alias]/[branch]
```
Transmit local branch commits to the remote repository branch