summaryrefslogtreecommitdiff
path: root/rev-parse.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-02-28 23:07:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-01 09:45:50 (GMT)
commit765ac8ec469f110e88376e4fac05d0ed475bcb28 (patch)
tree151dd9135fb335aeffc4b0e4406c8c4cf8b27e2c /rev-parse.c
parent70b006b9712b57741ec1320b15aef2f8b1d6a905 (diff)
downloadgit-765ac8ec469f110e88376e4fac05d0ed475bcb28.zip
git-765ac8ec469f110e88376e4fac05d0ed475bcb28.tar.gz
git-765ac8ec469f110e88376e4fac05d0ed475bcb28.tar.bz2
Rip out merge-order and make "git log <paths>..." work again.
Well, assuming breaking --merge-order is fine, here's a patch (on top of the other ones) that makes git log <filename> actually work, as far as I can tell. I didn't add the logic for --before/--after flags, but that should be pretty trivial, and is independent of this anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'rev-parse.c')
-rw-r--r--rev-parse.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/rev-parse.c b/rev-parse.c
index 610eacb..f90e999 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -39,14 +39,12 @@ static int is_rev_argument(const char *arg)
"--header",
"--max-age=",
"--max-count=",
- "--merge-order",
"--min-age=",
"--no-merges",
"--objects",
"--objects-edge",
"--parents",
"--pretty",
- "--show-breaks",
"--sparse",
"--topo-order",
"--date-order",