diff options
| author | Jonathan Nieder <jrnieder@uchicago.edu> | 2008-07-03 07:20:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-05 20:24:39 +0200 |
| commit | 7a7d4ef69c2c79b10977508794e1bbd62ca9ed2b (patch) | |
| tree | d2e75e8e465ddbf5ec1bb7106dcf87168828bbe3 /Documentation/user-manual.txt | |
| parent | git-commit(1): depersonalize description (diff) | |
| download | git-7a7d4ef69c2c79b10977508794e1bbd62ca9ed2b.tar.xz git-7a7d4ef69c2c79b10977508794e1bbd62ca9ed2b.zip | |
Documentation: rewrap to prepare for "git-" vs "git " change
Rewrap lines in preparation for added dashes.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/user-manual.txt | 8 |
1 files changed, 4 insertions, 4 deletions
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 <<fast-forwards,fast forward>>. |