Skip to content

Commit 7a7d4ef

Browse files
Jonathan Niedergitster
authored andcommitted
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>
1 parent d69806d commit 7a7d4ef

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Documentation/config.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,8 @@ gc.autopacklimit::
627627
gc.packrefs::
628628
`git gc` does not run `git pack-refs` in a bare repository by
629629
default so that older dumb-transport clients can still fetch
630-
from the repository. Setting this to `true` lets `git
631-
gc` to run `git pack-refs`. Setting this to `false` tells
630+
from the repository. Setting this to `true` lets `git gc`
631+
to run `git pack-refs`. Setting this to `false` tells
632632
`git gc` never to run `git pack-refs`. The default setting is
633633
`notbare`. Enable it only when you know you do not have to
634634
support such clients. The default setting will change to `true`

Documentation/user-manual.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2443,8 +2443,8 @@ patches to the new mywork. The result will look like:
24432443
................................................
24442444

24452445
In the process, it may discover conflicts. In that case it will stop
2446-
and allow you to fix the conflicts; after fixing conflicts, use "git
2447-
add" to update the index with those contents, and then, instead of
2446+
and allow you to fix the conflicts; after fixing conflicts, use "git add"
2447+
to update the index with those contents, and then, instead of
24482448
running git-commit, just run
24492449

24502450
-------------------------------------------------
@@ -2700,8 +2700,8 @@ master branch. In more detail:
27002700
git fetch and fast-forwards
27012701
---------------------------
27022702

2703-
In the previous example, when updating an existing branch, "git
2704-
fetch" checks to make sure that the most recent commit on the remote
2703+
In the previous example, when updating an existing branch, "git fetch"
2704+
checks to make sure that the most recent commit on the remote
27052705
branch is a descendant of the most recent commit on your copy of the
27062706
branch before updating your copy of the branch to point at the new
27072707
commit. Git calls this process a <<fast-forwards,fast forward>>.

0 commit comments

Comments
 (0)