summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d69806d)
raw | patch | inline | side by side (parent: d69806d)
author | Jonathan Nieder <jrnieder@uchicago.edu> | |
Thu, 3 Jul 2008 05:20:21 +0000 (00:20 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 5 Jul 2008 18:24:39 +0000 (11:24 -0700) |
Rewrap lines in preparation for added dashes.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt | patch | blob | history | |
Documentation/user-manual.txt | patch | blob | history |
index 561ff645f96af3a53a6d43c4d9320090aef623e8..bb12f0332dba505529cb9a36cca3c0c03ebcae8d 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
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`
index cbfc5d03a388179e6f32c1969ac4cdef24dd371b..61cf30f8f47adae3bbd697bb23539f2009c831e0 100644 (file)
................................................
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
-------------------------------------------------
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>>.