author | Junio C Hamano <junkio@cox.net> | |
Tue, 31 Oct 2006 22:22:34 +0000 (14:22 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 31 Oct 2006 22:22:34 +0000 (14:22 -0800) | ||
commit | 62476c8e331a22e224d87c18830913129f5f303b | |
tree | f81057bf5002f016d26a82d055ff694f31ab2e43 | tree | snapshot |
parent | 0d981c67d8bcf4610e165744059c1e9e14609baa | commit | diff |
Introduce a new revision set operator <rev>^!
This is a shorthand for "<rev> --not <rev>^@", i.e. "include
this commit but exclude any of its parents".
When a new file $F is introduced by revision $R, this notation
can be used to find a copy-and-paste from existing file in the
parents of that revision without annotating the ancestry of the
lines that were copied from:
git pickaxe -f -C $R^! -- $F
Signed-off-by: Junio C Hamano <junkio@cox.net>
This is a shorthand for "<rev> --not <rev>^@", i.e. "include
this commit but exclude any of its parents".
When a new file $F is introduced by revision $R, this notation
can be used to find a copy-and-paste from existing file in the
parents of that revision without annotating the ancestry of the
lines that were copied from:
git pickaxe -f -C $R^! -- $F
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-pickaxe.txt | diff | blob | history | |
Documentation/git-rev-parse.txt | diff | blob | history | |
revision.c | diff | blob | history |