diff options
| author |  Steven Grimm <koreth@midwinter.com> | 2007-08-20 11:36:38 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-08-19 22:56:10 -0700 |
| commit | 257a84d9d02e90447b149af58b271c19405edb6a (patch) | |
| tree | 5e63a9f2c9bf53cb9fc0a2bda09bb1ff746cc676 /Documentation/gitignore.txt | |
| parent | Don't allow combination of -g and --reverse as it doesn't work (diff) | |
| download | tgif-257a84d9d02e90447b149af58b271c19405edb6a.tar.xz | |
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 'Documentation/gitignore.txt')
0 files changed, 0 insertions, 0 deletions