Re: [PATCH] user-manual.txt: fix a few mistakes
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 14, 2007, 19:42 UTC
- Message-ID
- <7v8x50hawk.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <20071114181858.GH14254@fieldses.org>
"J. Bruce Fields" <bfields@fieldses.org> writes:
Show 20 quoted lines
> I actually prefer "head" here. On something like: > > A--B--C > / > o--o--o > \ > o--o--o > > > The term "branch" could be used to refer to the whole line of > development consisting of A, B, and C. The term "head", on the other > hand, refers to either C or a ref that points to it. We also use the > terms "branch head" or just "branch" for that case, but I think "head" > is more precise. > >> +This lists the commits reachable from the previous version of the branch. >> +This syntax can be used with any git command that accepts a commit, >> not just with git log. Some other examples: > > (Otherwise looks fine, thanks!)
Oops, I think I skipped the hunk #2 and applied hunk #3. Will fix-up with:
-- >8 -- From: Sergei Organov <osv@javad.com> Subject: 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>
--- Documentation/user-manual.txt | 4 ++-- 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:
-- 1.5.3.5.1746.g62954