From: David Kågedal <davidk@lysator.liu.se>
Date: Thu, 18 Jan 2007 11:27:35 +0000 (+0100)
Subject: Document --ignore-if-in-upstream in git-format-patch
X-Git-Tag: v1.5.0-rc2~33
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cc75ad6762209ff6055c30b822bce22b105eb7d9;p=git.git

Document --ignore-if-in-upstream in git-format-patch

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index e7703a500..59f34b9f0 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -12,6 +12,7 @@ SYNOPSIS
 'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
 	           [-s | --signoff] [--diff-options] [--start-number <n>]
 		   [--in-reply-to=Message-Id] [--suffix=.<sfx>]
+		   [--ignore-if-in-upstream]
 		   <since>[..<until>]
 
 DESCRIPTION
@@ -80,6 +81,13 @@ OPTIONS
 	reply to the given Message-Id, which avoids breaking threads to
 	provide a new patch series.
 
+--ignore-if-in-upstream::
+	Do not include a patch that matches a commit in
+	<until>..<since>.  This will examine all patches reachable
+	from <since> but not from <until> and compare them with the
+	patches being generated, and any patch that matches is
+	ignored.
+
 --suffix=.<sfx>::
 	Instead of using `.patch` as the suffix for generated
 	filenames, use specifed suffix.  A common alternative is