diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-24 02:08:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-24 02:08:31 -0700 |
| commit | 1066c2c5482b8b5fb968c3a4acaa32a48bad2534 (patch) | |
| tree | 0d1b6796d43c6d389ad48deaf563bf7e8878f60e /builtin-log.c | |
| parent | fc746df6476078fa04f821aea00f84bbe13dbf9f (diff) | |
| parent | 9f38e1ef7e7992ca490b9b419f52fb4d11efb0e4 (diff) | |
| download | git-1066c2c5482b8b5fb968c3a4acaa32a48bad2534.tar.gz | |
Merge branch 'lt/follow'
* lt/follow:
Fix up "git log --follow" a bit..
Finally implement "git log --follow"
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin-log.c b/builtin-log.c index b9035ab799..073a2a16a3 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -58,6 +58,11 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, argc = setup_revisions(argc, argv, rev, "HEAD"); if (rev->diffopt.pickaxe || rev->diffopt.filter) rev->always_show_header = 0; + if (rev->diffopt.follow_renames) { + rev->always_show_header = 0; + if (rev->diffopt.nr_paths != 1) + usage("git logs can only follow renames on one pathname at a time"); + } for (i = 1; i < argc; i++) { const char *arg = argv[i]; if (!strcmp(arg, "--decorate")) { |