Merge branch 'jc/pickaxe'

2006-11-07 16:33:59 -08:00
parent 231f240b63 7bd9641df5
commit 24ad8e0ce2
13 changed files with 2093 additions and 4 deletions
--- 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;