mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: rewrap to prepare for "git-" vs "git " change

Browse Source 
Rewrap lines in preparation for added dashes.

Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder
2008-07-03 00:20:21 -05:00
committed by Junio C Hamano
parent d69806d198
commit 7a7d4ef69c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config.txt
View File

@ -627,8 +627,8 @@ gc.autopacklimit::
gc.packrefs:: gc.packrefs::
`git gc` does not run `git pack-refs` in a bare repository by `git gc` does not run `git pack-refs` in a bare repository by
default so that older dumb-transport clients can still fetch default so that older dumb-transport clients can still fetch
from the repository. Setting this to `true` lets `git from the repository. Setting this to `true` lets `git gc`
gc` to run `git pack-refs`. Setting this to `false` tells to run `git pack-refs`. Setting this to `false` tells
`git gc` never to run `git pack-refs`. The default setting is `git gc` never to run `git pack-refs`. The default setting is
`notbare`. Enable it only when you know you do not have to `notbare`. Enable it only when you know you do not have to
support such clients. The default setting will change to `true` support such clients. The default setting will change to `true`

8
Documentation/user-manual.txt
View File

@ -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 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 and allow you to fix the conflicts; after fixing conflicts, use "git add"
add" to update the index with those contents, and then, instead of to update the index with those contents, and then, instead of
running git-commit, just run running git-commit, just run
------------------------------------------------- -------------------------------------------------
@ -2700,8 +2700,8 @@ master branch. In more detail:
git fetch and fast-forwards git fetch and fast-forwards
--------------------------- ---------------------------
In the previous example, when updating an existing branch, "git In the previous example, when updating an existing branch, "git fetch"
fetch" checks to make sure that the most recent commit on the remote 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 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 branch before updating your copy of the branch to point at the new
commit. Git calls this process a <<fast-forwards,fast forward>>. commit. Git calls this process a <<fast-forwards,fast forward>>.