summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-08-27 20:42:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-27 20:42:42 -0700
commit749086fa090d81c10ebf16b1abfd138c3fa0232e (patch)
treea65d08d7e5f8f66a2f4cec1c1ad729db1ee3d183 /Documentation
parentgit-log: allow --decorate[=short|full] (diff)
parentMerge branch 'maint-1.6.2' into maint-1.6.3 (diff)
downloadtgif-749086fa090d81c10ebf16b1abfd138c3fa0232e.tar.xz
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3: 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
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::