summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-27 20:42:38 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-27 20:42:38 -0700
commit5e64650d938d7a23b73532b4a68bc6bd08cfd041 (patch)
tree303f0b96211f347c2b47d04808ceb08ede54c493 /Documentation
parent9e4a90ba19033d25dca1eea495b0a8c5f06efbc6 (diff)
parent93197898041fcaf84d8ac84df764cca7bf86b226 (diff)
downloadgit-5e64650d938d7a23b73532b4a68bc6bd08cfd041.tar.gz
Merge branch 'maint-1.6.2' into maint-1.6.3
* maint-1.6.2: 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 Conflicts: Documentation/git-archive.txt
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-archive.txt2
-rw-r--r--Documentation/git-gc.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index bc132c87e1..92444ddf10 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -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...]
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index b292e9843a..dcac8c8e29 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -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::