From 7a7d4ef69c2c79b10977508794e1bbd62ca9ed2b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 3 Jul 2008 00:20:21 -0500 Subject: Documentation: rewrap to prepare for "git-" vs "git " change Rewrap lines in preparation for added dashes. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Documentation/user-manual.txt') diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index cbfc5d03a3..61cf30f8f4 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2443,8 +2443,8 @@ patches to the new mywork. The result will look like: ................................................ In the process, it may discover conflicts. In that case it will stop -and allow you to fix the conflicts; after fixing conflicts, use "git -add" to update the index with those contents, and then, instead of +and allow you to fix the conflicts; after fixing conflicts, use "git add" +to update the index with those contents, and then, instead of running git-commit, just run ------------------------------------------------- @@ -2700,8 +2700,8 @@ master branch. In more detail: git fetch and fast-forwards --------------------------- -In the previous example, when updating an existing branch, "git -fetch" checks to make sure that the most recent commit on the remote +In the previous example, when updating an existing branch, "git fetch" +checks to make sure that the most recent commit on the remote branch is a descendant of the most recent commit on your copy of the branch before updating your copy of the branch to point at the new commit. Git calls this process a <>. -- cgit v1.2.3