Update documentation for --git-prefixes

Assisted-by: Cursor

Author: twaugh

doc/patchutils.xml

@@ -870,7 +870,9 @@
 	    <listitem>
 	      <para>How to handle <literal>a/</literal> and <literal>b/</literal>
 	        prefixes in Git diff filenames. With <literal>strip</literal>, removes
-	        the prefixes for consistent output. With <literal>keep</literal> (default),
+	        the prefixes both for filename matching (when using <option>-i</option>
+	        and <option>-x</option> options) and for filename output (similar to
+	        <option>--strip</option>). With <literal>keep</literal> (default),
 	        preserves existing behavior. Applies to both Git-specific diffs (binary files,
 	        renames, mode changes) and traditional diffs when part of a Git patch.
 	        Note: Git rename operations use <literal>rename from/to</literal> headers
@@ -1383,6 +1385,23 @@ patch.file]]></screen></para>
 	    </listitem>
 	  </varlistentry>
 
+	  <varlistentry>
+	    <term><option>--git-prefixes</option>=<replaceable>strip|keep</replaceable></term>
+	    <listitem>
+	      <para>How to handle <literal>a/</literal> and <literal>b/</literal>
+	        prefixes in Git diff filenames. With <literal>strip</literal>, removes
+	        the prefixes both for filename matching (when using <option>-i</option>
+	        and <option>-x</option> options) and for filename output (similar to
+	        <option>--strip</option>). With <literal>keep</literal> (default),
+	        preserves existing behavior. Applies to both Git-specific diffs (binary files,
+	        renames, mode changes) and traditional diffs when part of a Git patch.
+	        Note: Git rename operations use <literal>rename from/to</literal> headers
+	        that contain literal filenames without <literal>a/</literal> or
+	        <literal>b/</literal> prefixes, so this option does not affect renamed
+	        filenames. The default will change to <literal>strip</literal> in version 0.5.0.</para>
+	    </listitem>
+	  </varlistentry>
+
 	  <varlistentry>
 	    <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
 	    <listitem>
@@ -1563,6 +1582,7 @@ done)]]></screen></para>
 	    <arg>--strip-match=<replaceable>n</replaceable></arg>
 	  </group>
 	  <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
+	  <arg choice="opt">--git-prefixes=<replaceable>strip|keep</replaceable></arg>
 	  <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
 	  <group choice="opt">
 	    <arg>-s</arg>
@@ -1772,6 +1792,23 @@ will pipe patch of file #2 to vim - -R
 	    </listitem>
 	  </varlistentry>
 
+	  <varlistentry>
+	    <term><option>--git-prefixes</option>=<replaceable>strip|keep</replaceable></term>
+	    <listitem>
+	      <para>How to handle <literal>a/</literal> and <literal>b/</literal>
+	        prefixes in Git diff filenames. With <literal>strip</literal>, removes
+	        the prefixes both for filename matching (when using <option>-i</option>
+	        and <option>-x</option> options) and for filename output (similar to
+	        <option>--strip</option>). With <literal>keep</literal> (default),
+	        preserves existing behavior. Applies to both Git-specific diffs (binary files,
+	        renames, mode changes) and traditional diffs when part of a Git patch.
+	        Note: Git rename operations use <literal>rename from/to</literal> headers
+	        that contain literal filenames without <literal>a/</literal> or
+	        <literal>b/</literal> prefixes, so this option does not affect renamed
+	        filenames. The default will change to <literal>strip</literal> in version 0.5.0.</para>
+	    </listitem>
+	  </varlistentry>
+
 	  <varlistentry>
 	    <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
 	    <listitem>
@@ -2222,6 +2259,7 @@ will pipe patch of file #2 to vim - -R
 	    <arg>--strip-match=<replaceable>n</replaceable></arg>
 	  </group>
 	  <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
+	  <arg choice="opt">--git-prefixes=<replaceable>strip|keep</replaceable></arg>
 	  <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
 	  <arg choice="opt">--addoldprefix=<replaceable>PREFIX</replaceable></arg>
 	  <arg choice="opt">--addnewprefix=<replaceable>PREFIX</replaceable></arg>
@@ -2373,6 +2411,23 @@ will pipe patch of file #2 to vim - -R
 	    </listitem>
 	  </varlistentry>
 
+	  <varlistentry>
+	    <term><option>--git-prefixes</option>=<replaceable>strip|keep</replaceable></term>
+	    <listitem>
+	      <para>How to handle <literal>a/</literal> and <literal>b/</literal>
+	        prefixes in Git diff filenames. With <literal>strip</literal>, removes
+	        the prefixes both for filename matching (when using <option>-i</option>
+	        and <option>-x</option> options) and for filename output (similar to
+	        <option>--strip</option>). With <literal>keep</literal> (default),
+	        preserves existing behavior. Applies to both Git-specific diffs (binary files,
+	        renames, mode changes) and traditional diffs when part of a Git patch.
+	        Note: Git rename operations use <literal>rename from/to</literal> headers
+	        that contain literal filenames without <literal>a/</literal> or
+	        <literal>b/</literal> prefixes, so this option does not affect renamed
+	        filenames. The default will change to <literal>strip</literal> in version 0.5.0.</para>
+	    </listitem>
+	  </varlistentry>
+
 	  <varlistentry>
 	    <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
 	    <listitem>

src/filterdiff.c

@@ -1564,7 +1564,8 @@ const char * syntax_str =
 "            initial pathname components to ignore\n"
 "  --strip=N initial pathname components to strip\n"
 "  --git-prefixes=strip|keep\n"
-"            how to handle a/ and b/ prefixes in Git diffs (default: keep)\n"
+"            how to handle a/ and b/ prefixes in Git diffs for both filename\n"
+"            matching (-i/-x) and output (default: keep)\n"
 "  --addprefix=PREFIX\n"
 "            prefix pathnames with PREFIX\n"
 "  --addoldprefix=PREFIX\n"