diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-15 01:59:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-15 01:59:49 -0700 |
| commit | 5d27a7d58ca9b92c387b9585392f5241e615d594 (patch) | |
| tree | 3d12e8383e448f1c33aba4728b352c390d534945 /rev-list.c | |
| parent | Merge branch 'master' into next (diff) | |
| parent | Revert all the rev-list option parsing changes. (diff) | |
| download | tgif-5d27a7d58ca9b92c387b9585392f5241e615d594.tar.xz | |
Merge branch 'jc/logopt' into next
* jc/logopt:
Revert all the rev-list option parsing changes.
Diffstat (limited to 'rev-list.c')
| -rw-r--r-- | rev-list.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rev-list.c b/rev-list.c index b7aee1abb2..cb67b399fc 100644 --- a/rev-list.c +++ b/rev-list.c @@ -365,10 +365,8 @@ int main(int argc, const char **argv) list = revs.commits; - if ((!list && - (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && - !revs.pending_objects)) || - revs.diff) + if (!list && + (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects)) usage(rev_list_usage); save_commit_buffer = verbose_header; |