path: root/Documentation/user-manual.txt
diff options
authorJunio C Hamano <>2008-08-11 07:53:31 (GMT)
committerJunio C Hamano <>2008-08-11 07:53:31 (GMT)
commit10d9d887ecdc81197162d7bbe5dfc0d028498fd6 (patch)
treef726621f79162565bf066400df697a078680601a /Documentation/user-manual.txt
parent71b9979bc74b66c1cf961d5c74de5c0b3cbf00a4 (diff)
parent4f80b27d48fee1c588810f3341ffe5d14558cea2 (diff)
Merge branch 'maint'
* maint: Documentation: fix invalid reference to 'mybranch' in user manual Fix deleting reflog entries from HEAD reflog reflog test: add more tests for 'reflog delete' Documentation: rev-list-options: Fix -g paragraph formatting Conflicts: Documentation/user-manual.txt
Diffstat (limited to 'Documentation/user-manual.txt')
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index f421689..e999211 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/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