Merge branch 'maint-1.8.2' into maint-1.8.3
* maint-1.8.2: Documentation/git-merge.txt: fix formatting of example block
This commit is contained in:
commit
69490f3459
@ -186,11 +186,11 @@ In such a case, you can "unwrap" the tag yourself before feeding it
|
|||||||
to `git merge`, or pass `--ff-only` when you do not have any work on
|
to `git merge`, or pass `--ff-only` when you do not have any work on
|
||||||
your own. e.g.
|
your own. e.g.
|
||||||
|
|
||||||
---
|
----
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git merge v1.2.3^0
|
git merge v1.2.3^0
|
||||||
git merge --ff-only v1.2.3
|
git merge --ff-only v1.2.3
|
||||||
---
|
----
|
||||||
|
|
||||||
|
|
||||||
HOW CONFLICTS ARE PRESENTED
|
HOW CONFLICTS ARE PRESENTED
|
||||||
|
Loading…
Reference in New Issue
Block a user