| commit | 257a84d9d02e90447b149af58b271c19405edb6a | |
| author | Steven Grimm <koreth@midwinter.com> | |
| Mon, 20 Aug 2007 03:36:38 +0000 (20 11:36 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Aug 2007 05:56:10 +0000 (19 22:56 -0700) | ||
| tree | 5e63a9f2c9bf53cb9fc0a2bda09bb1ff746cc676 | treesnapshot (tar.gz zip) |
| parent | d56651c0ef1c81c1d0509ea4464451d5724e4036 | commitdiff |
Document what the stage numbers in the :$n:path syntax mean.
The git-rev-parse manpage talks about the :$n:path notation (buried deep in
a list of other syntax) but it just says $n is a "stage number" -- someone
who is not familiar with the internals of git's merge implementation is
never going to be able to figure out that "1", "2", and "3" means.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The git-rev-parse manpage talks about the :$n:path notation (buried deep in
a list of other syntax) but it just says $n is a "stage number" -- someone
who is not familiar with the internals of git's merge implementation is
never going to be able to figure out that "1", "2", and "3" means.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-rev-parse.txt | diffblobblamehistory |