Merge branch 'jc/diffcore-rotate'

[thirdparty/git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index e5733ccb2d1a7a2e6ad419f20a019f526c5d475a..aa2b5c11f20bf3c94a9a7b704ac72dfe24b5900d 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -700,6 +700,14 @@ matches a pattern if removing any number of the final pathname
 components matches the pattern.  For example, the pattern "`foo*bar`"
 matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`".
 
+--skip-to=<file>::
+--rotate-to=<file>::
+       Discard the files before the named <file> from the output
+       (i.e. 'skip to'), or move them to the end of the output
+       (i.e. 'rotate to').  These were invented primarily for use
+       of the `git difftool` command, and may not be very useful
+       otherwise.
+
 ifndef::git-format-patch[]
 -R::
        Swap two inputs; that is, show differences from index or