Merge branch 'maint-1.7.0' into maint-1.7.1

* maint-1.7.0: request-pull.txt: Document -p option Check size of path buffer before writing into it
git-mirror · Jul 26, 2010 · c4818fa · c4818fa
2 parents 971ecbd + 28bf4ba
commit c4818fa
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt
@@ -7,7 +7,7 @@ git-request-pull - Generates a summary of pending changes
 
 SYNOPSIS
 --------
-'git request-pull' <start> <url> [<end>]
+'git request-pull' [-p] <start> <url> [<end>]
 
 DESCRIPTION
 -----------
@@ -17,6 +17,9 @@ the given URL in the generated summary.
 
 OPTIONS
 -------
+-p::
+	Show patch text
+
 <start>::
 	Commit to start at.