diff options
author | John Keeping <john@keeping.me.uk> | 2013-03-02 12:32:10 +0000 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-03-02 10:38:03 -0500 |
commit | bfc14d067da0fdf65f306fcd9a65829d9694dbeb (patch) | |
tree | 71097af45a55844f67f4af411d461903f5d60519 /ui-stats.c | |
parent | c0a92e82da3063efc230538ba109ff95aa59589a (diff) |
Update git to v1.7.5.4
Some changes to diff options:
- no_merges has become the more general max_parents
- path restriction now uses struct pathspec
Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-stats.c')
-rw-r--r-- | ui-stats.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -239,7 +239,7 @@ struct string_list collect_stats(struct cgit_context *ctx, init_revisions(&rev, NULL); rev.abbrev = DEFAULT_ABBREV; rev.commit_format = CMIT_FMT_DEFAULT; - rev.no_merges = 1; + rev.max_parents = 1; rev.verbose_header = 1; rev.show_root_diff = 0; setup_revisions(argc, argv, &rev, NULL); |