diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-07 16:33:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-07 16:33:59 -0800 |
| commit | 24ad8e0ce23d08d28a5d664ab6164b10125146ce (patch) | |
| tree | edcba1269b22d79a04558b83f47617f3ecc2acd0 /revision.c | |
| parent | 231f240b63bd6cb1313e8952448b3d5b9d2fdf26 (diff) | |
| parent | 7bd9641df5b7cca91b21bfdc587962c59700786c (diff) | |
| download | git-24ad8e0ce23d08d28a5d664ab6164b10125146ce.tar.gz git-24ad8e0ce23d08d28a5d664ab6164b10125146ce.tar.xz | |
Merge branch 'jc/pickaxe'
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 3dbc26c49..993bb668a 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; |