From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Nov 2013 22:37:35 +0000 (-0800)
Subject: Merge branch 'vd/doc-unpack-objects' into maint
X-Git-Tag: v1.8.4.3~7
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/5022b58e5832297f654230db89c0d0f92d8e3f1e

Merge branch 'vd/doc-unpack-objects' into maint

The synopsis section of "git unpack-objects" documentation has been
clarified a bit.

* vd/doc-unpack-objects:
  Documentation: "pack-file" is not literal in unpack-objects
  Documentation: restore a space in unpack-objects usage
---

5022b58e5832297f654230db89c0d0f92d8e3f1e
diff --cc Documentation/git-unpack-objects.txt
index ff23494e70,6b94df39b6..12cb108b85
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@@ -8,8 -9,7 +8,8 @@@ git-unpack-objects - Unpack objects fro
  
  SYNOPSIS
  --------
 -'git-unpack-objects' [-q] < <pack-file>
 +[verse]
- 'git unpack-objects' [-n] [-q] [-r] [--strict] <pack-file
++'git unpack-objects' [-n] [-q] [-r] [--strict] < <pack-file>
  
  
  DESCRIPTION