summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorSergei Organov <osv@javad.com>2007-11-14 20:08:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-14 20:08:15 (GMT)
commit93cbbd7121c34b04576518b663f188c5495d4575 (patch)
tree2ca1807a8390659f45f54d3032247054ad26b2b0 /Documentation/user-manual.txt
parentfb5fd011482b5aa0b340a4a5bd9192c0efc1edb7 (diff)
downloadgit-93cbbd7121c34b04576518b663f188c5495d4575.zip
git-93cbbd7121c34b04576518b663f188c5495d4575.tar.gz
git-93cbbd7121c34b04576518b663f188c5495d4575.tar.bz2
user-manual: minor rewording for clarity.
Junio screwed up when applying the previous round of the patch; rewording from "previous" to "old" does make the description clearer. Also revert the rewording from head to branch. The description is talking about the branch's tip commit and using the word head is clearer. Based on input from Sergei and Bruce. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 60e1385..c7cfbbc 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1367,7 +1367,7 @@ If you make a commit that you later wish you hadn't, there are two
fundamentally different ways to fix the problem:
1. You can create a new commit that undoes whatever was done
- by the previous commit. This is the correct thing if your
+ by the old commit. This is the correct thing if your
mistake has already been made public.
2. You can go back and modify the old commit. You should
@@ -1567,7 +1567,7 @@ old history using, for example,
$ git log master@{1}
-------------------------------------------------
-This lists the commits reachable from the previous version of the branch.
+This lists the commits reachable from the previous version of the head.
This syntax can be used with any git command that accepts a commit,
not just with git log. Some other examples: