Merge http://www.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt
index 893c1df55ecfecbd8725d91956c6cee1d68a2db1..8d96a91b410d91eefb6b424d2f3c54e33520b92b 100644 (file)
--- a/Documentation/git-prune-packed.txt
+++ b/Documentation/git-prune-packed.txt
@@ -1,6 +1,5 @@
 git-prune-packed(1)
 =====================
-v0.1, August 2005
 
 NAME
 ----
@@ -24,6 +23,12 @@ compression applied, stored in a single file, with an associated index file.
 
 Packs are used to reduce the load on mirror systems, backup engines, disk storage, etc.
 
+OPTIONS
+-------
+-n::
+        Don't actually remove any objects, only show those that would have been
+        removed.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
@@ -34,9 +39,10 @@ Documentation by Ryan Anderson <ryan@michonline.com>
 
 See-Also
 --------
-git-pack-objects(1) git-repack-script(1)
+gitlink:git-pack-objects[1]
+gitlink:git-repack[1]
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite