summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-03-10 21:52:39 -0500
committerLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-03-10 23:05:01 -0500
commitfabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a (patch)
treea7f3a909000f264a885ae60215b17332f372f258 /Documentation
parentuser-manual: fix inconsistent example (diff)
downloadtgif-fabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a.tar.xz
user-manual: fix inconsistent use of pull and merge
I used "git pull ." instead of "git merge" here without any explanation. Stick instead to "git merge" for now (the equivalent pull syntax is still covered in a later chapter). Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/user-manual.txt14
1 files changed, 3 insertions, 11 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 8b5709ba75..f4ea967191 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1133,17 +1133,9 @@ modified in two different ways in the remote branch and the local
branch--then you are warned; the output may look something like this:
-------------------------------------------------
-$ git pull . next
-Trying really trivial in-index merge...
-fatal: Merge requires file-level merging
-Nope.
-Merging HEAD with 77976da35a11db4580b80ae27e8d65caf5208086
-Merging:
-15e2162 world
-77976da goodbye
-found 1 common ancestor(s):
-d122ed4 initial
-Auto-merging file.txt
+$ git merge next
+ 100% (4/4) done
+Auto-merged file.txt
CONFLICT (content): Merge conflict in file.txt
Automatic merge failed; fix conflicts and then commit the result.
-------------------------------------------------