mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: Fix overridable written with an extra 'e' Documentation: git-archive: mark --format as optional in summary Round-down years in "years+months" relative date view
This commit is contained in:
commit
aab9ea1aad
|
@ -9,7 +9,7 @@ git-archive - Create an archive of files from a named tree
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
|
||||
'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
|
||||
[--output=<file>] [--worktree-attributes]
|
||||
[--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
|
||||
[path...]
|
||||
|
|
|
@ -61,7 +61,7 @@ automatic consolidation of packs.
|
|||
|
||||
--prune=<date>::
|
||||
Prune loose objects older than date (default is 2 weeks ago,
|
||||
overrideable by the config variable `gc.pruneExpire`). This
|
||||
overridable by the config variable `gc.pruneExpire`). This
|
||||
option is on by default.
|
||||
|
||||
--no-prune::
|
||||
|
|
2
date.c
2
date.c
|
@ -135,7 +135,7 @@ const char *show_date(unsigned long time, int tz, enum date_mode mode)
|
|||
}
|
||||
/* Give years and months for 5 years or so */
|
||||
if (diff < 1825) {
|
||||
unsigned long years = (diff + 183) / 365;
|
||||
unsigned long years = diff / 365;
|
||||
unsigned long months = (diff % 365 + 15) / 30;
|
||||
int n;
|
||||
n = snprintf(timebuf, sizeof(timebuf), "%lu year%s",
|
||||
|
|
|
@ -415,7 +415,7 @@ sub gitweb_get_feature {
|
|||
@{$feature{$name}{'default'}});
|
||||
if (!$override) { return @defaults; }
|
||||
if (!defined $sub) {
|
||||
warn "feature $name is not overrideable";
|
||||
warn "feature $name is not overridable";
|
||||
return @defaults;
|
||||
}
|
||||
return $sub->(@defaults);
|
||||
|
|
Loading…
Reference in a new issue