summaryrefslogtreecommitdiffstats
path: root/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-08-11 22:03:10 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-08-11 22:03:10 +0000
commit1d36888341421a7ba59def87f39c3f7d25989e37 (patch)
tree2f8783d094385487b70cf32831a1400043e2eefa /user-manual.txt
parentfaa1e50737bfc349e8315c99a2ed59182fd557b1 (diff)
downloadgit-htmldocs-1d36888341421a7ba59def87f39c3f7d25989e37.tar.gz
Autogenerated HTML docs for v1.6.0-rc2-29-gac39e
Diffstat (limited to 'user-manual.txt')
-rw-r--r--user-manual.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/user-manual.txt b/user-manual.txt
index f42168994..e99921108 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -2825,8 +2825,8 @@ You can also add a "+" to force the update each time:
$ git config remote.example.fetch +master:ref/remotes/example/master
-------------------------------------------------
-Don't do this unless you're sure you won't mind "git-fetch" possibly
-throwing away commits on mybranch.
+Don't do this unless you're sure you won't mind "git fetch" possibly
+throwing away commits on 'example/master'.
Also note that all of the above configuration can be performed by
directly editing the file .git/config instead of using