diff options
| author | Steven Grimm <koreth@midwinter.com> | 2007-08-20 03:36:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-20 05:56:10 (GMT) |
| commit | 257a84d9d02e90447b149af58b271c19405edb6a (patch) | |
| tree | 5e63a9f2c9bf53cb9fc0a2bda09bb1ff746cc676 /git-pull.sh | |
| parent | d56651c0ef1c81c1d0509ea4464451d5724e4036 (diff) | |
| download | git-257a84d9d02e90447b149af58b271c19405edb6a.zip git-257a84d9d02e90447b149af58b271c19405edb6a.tar.gz git-257a84d9d02e90447b149af58b271c19405edb6a.tar.bz2 | |
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>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions