fmt-merge-msg: say which branch things were merged into unless 'master'

diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index bd830ada274335b723f3382b9b4a554fa3c15701..9060fe889724182e5478df72a8b9331f7411601c 100644 (file)
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -1,6 +1,5 @@
 git-repack(1)
 =============
-v0.99.5, August 2005
 
 NAME
 ----
@@ -10,7 +9,7 @@ objects into pack files.
 
 SYNOPSIS
 --------
-'git-repack' [-a] [-d]
+'git-repack' [-a] [-d] [-l] [-n]
 
 DESCRIPTION
 -----------
@@ -40,6 +39,13 @@ OPTIONS
        After packing, if the newly created packs make some
        existing packs redundant, remove the redundant packs.
 
+-l::
+        Pass the `--local` option to `git pack-objects`, see
+        gitlink:git-pack-objects[1].
+
+-n::
+        Do not update the server information with
+        `git update-server-info`.
 
 Author
 ------