development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 05:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-1.8.2' into maint-1.8.3

Browse source 
* maint-1.8.2:
  Documentation/git-merge.txt: fix formatting of example block
This commit is contained in:
Junio C Hamano 2013-09-05 14:24:52 -07:00
parent e5be297279 e45bda876a
commit 69490f3459
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/git-merge.txt
View file

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