From: J. Bruce Fields Date: Sun, 11 Mar 2007 02:52:39 +0000 (-0500) Subject: user-manual: fix inconsistent use of pull and merge X-Git-Tag: v1.5.0.4~12^2~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a;p=git.git 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 Signed-off-by: "J. Bruce Fields" --- diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 8b5709ba7..f4ea96719 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. -------------------------------------------------