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

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index d1e93dbb372624d68fa96eb8bed141f1e76f0308..2d67d3911ed9e6081534f5311b0a76c632f73a6d 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -8,7 +8,7 @@ git-pack-objects - Create a packed archive of objects.
 
 SYNOPSIS
 --------
-'git-pack-objects' [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list
+'git-pack-objects' [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list
 
 
 DESCRIPTION
@@ -46,7 +46,7 @@ base-name::
        output of the command.
 
 --stdout::
-       Write the pack contents (what would have been writtin to
+       Write the pack contents (what would have been written to
        .pack file) out to the standard output.
 
 --window and --depth::
@@ -70,6 +70,10 @@ base-name::
        that are packed and not in the local object store
        (i.e. borrowed from an alternate).
 
+--non-empty::
+        Only create a packed archive if it would contain at
+        least one object.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>