projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fk/blame' into next
[git.git]
/
rev-parse.c
diff --git
a/rev-parse.c
b/rev-parse.c
index
a5fb93c
..
f90e999
100644
(file)
--- a/
rev-parse.c
+++ b/
rev-parse.c
@@
-39,13
+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",