projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tutorial: adjust merge example to recursive strategy.
[git.git]
/
Documentation
/
tutorial.txt
diff --git
a/Documentation/tutorial.txt
b/Documentation/tutorial.txt
index
e2dfb00
..
cf7ba76
100644
(file)
--- a/
Documentation/tutorial.txt
+++ b/
Documentation/tutorial.txt
@@
-898,9
+898,8
@@
file, which had no differences in the `mybranch` branch), and say:
fatal: Merge requires file-level merging
Nope.
...
fatal: Merge requires file-level merging
Nope.
...
- merge: warning: conflicts during merge
- ERROR: Merge conflict in hello.
- fatal: merge program failed
+ Auto-merging hello
+ CONFLICT (content): Merge conflict in hello
Automatic merge failed/prevented; fix up by hand
----------------
Automatic merge failed/prevented; fix up by hand
----------------
@@
-942,10
+941,10
@@
environment, is `git show-branch`.
------------------------------------------------
$ git show-branch master mybranch
------------------------------------------------
$ git show-branch master mybranch
-* [master] Merge
d "mybranch" changes.
+* [master] Merge
work in mybranch
! [mybranch] Some work.
--
! [mybranch] Some work.
--
-+ [master] Merge
d "mybranch" changes.
++ [master] Merge
work in mybranch
++ [mybranch] Some work.
------------------------------------------------
++ [mybranch] Some work.
------------------------------------------------
@@
-998,10
+997,10
@@
looks like, or run `show-branch`, which tells you this.
------------------------------------------------
$ git show-branch master mybranch
------------------------------------------------
$ git show-branch master mybranch
-! [master] Merge
d "mybranch" changes.
- * [mybranch] Merge
d "mybranch" changes.
+! [master] Merge
work in mybranch
+ * [mybranch] Merge
work in mybranch
--
--
-++ [master] Merge
d "mybranch" changes.
+++ [master] Merge
work in mybranch
------------------------------------------------
------------------------------------------------