Skip to content

Commit

Permalink
Documentation: rewrap to prepare for "git-" vs "git " change
Browse files Browse the repository at this point in the history
Rewrap lines in preparation for added dashes.

Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Jul 5, 2008
1 parent d69806d commit 7a7d4ef
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -627,8 +627,8 @@ gc.autopacklimit::
gc.packrefs::
`git gc` does not run `git pack-refs` in a bare repository by
default so that older dumb-transport clients can still fetch
from the repository. Setting this to `true` lets `git
gc` to run `git pack-refs`. Setting this to `false` tells
from the repository. Setting this to `true` lets `git gc`
to run `git pack-refs`. Setting this to `false` tells
`git gc` never to run `git pack-refs`. The default setting is
`notbare`. Enable it only when you know you do not have to
support such clients. The default setting will change to `true`
Expand Down
8 changes: 4 additions & 4 deletions Documentation/user-manual.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

-------------------------------------------------
Expand Down Expand Up @@ -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>>.
Expand Down

0 comments on commit 7a7d4ef

Please sign in to comment.