summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-25 02:21:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-25 02:21:15 (GMT)
commit677f32c79f30cafc4a3270118d5cb3736d44be26 (patch)
tree2a9460b6bef7f21e6dbcdd98240835402ecf97e6 /Documentation
parentdfb78f0388260d739cee87bc8054573ee5e6156b (diff)
parent8c3ca72623121684e39be085588b9ef7c6306caa (diff)
downloadgit-677f32c79f30cafc4a3270118d5cb3736d44be26.zip
git-677f32c79f30cafc4a3270118d5cb3736d44be26.tar.gz
git-677f32c79f30cafc4a3270118d5cb3736d44be26.tar.bz2
Merge branch 'jm/doc-ref-prune'
* jm/doc-ref-prune: Documentation: fix git-prune example usage Documentation: remove --prune from pack-refs examples
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-pack-refs.txt4
-rw-r--r--Documentation/git-prune.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-pack-refs.txt b/Documentation/git-pack-refs.txt
index f131677..154081f 100644
--- a/Documentation/git-pack-refs.txt
+++ b/Documentation/git-pack-refs.txt
@@ -33,8 +33,8 @@ Subsequent updates to branches always create new files under
`$GIT_DIR/refs` directory hierarchy.
A recommended practice to deal with a repository with too many
-refs is to pack its refs with `--all --prune` once, and
-occasionally run `git pack-refs --prune`. Tags are by
+refs is to pack its refs with `--all` once, and
+occasionally run `git pack-refs`. Tags are by
definition stationary and are not expected to change. Branch
heads will be packed with the initial `pack-refs --all`, but
only the currently active branch heads will become unpacked,
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 80d01b0..bf82410 100644
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -59,7 +59,7 @@ borrows from your repository via its
`.git/objects/info/alternates`:
------------
-$ git prune $(cd ../another && $(git rev-parse --all))
+$ git prune $(cd ../another && git rev-parse --all)
------------
Notes