summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-08 00:33:59 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-08 00:33:59 (GMT)
commit24ad8e0ce23d08d28a5d664ab6164b10125146ce (patch)
treeedcba1269b22d79a04558b83f47617f3ecc2acd0 /revision.c
parent231f240b63bd6cb1313e8952448b3d5b9d2fdf26 (diff)
parent7bd9641df5b7cca91b21bfdc587962c59700786c (diff)
downloadgit-24ad8e0ce23d08d28a5d664ab6164b10125146ce.zip
git-24ad8e0ce23d08d28a5d664ab6164b10125146ce.tar.gz
git-24ad8e0ce23d08d28a5d664ab6164b10125146ce.tar.bz2
Merge branch 'jc/pickaxe'
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 3dbc26c..993bb66 100644
--- a/revision.c
+++ b/revision.c
@@ -657,6 +657,13 @@ int handle_revision_arg(const char *arg, struct rev_info *revs,
return 0;
*dotdot = '^';
}
+ dotdot = strstr(arg, "^!");
+ if (dotdot && !dotdot[2]) {
+ *dotdot = 0;
+ if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
+ *dotdot = '^';
+ }
+
local_flags = 0;
if (*arg == '^') {
local_flags = UNINTERESTING;