diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-26 00:43:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-26 00:43:31 (GMT) |
| commit | 6eea44cee1dc94a7d6f7fa768d5710f9385f22db (patch) | |
| tree | dc9ac2d574c1ba05912e446cab6400c04c0fd578 /Documentation | |
| parent | ccf6861b7272f99ab078345e1ee6d6b37b742cc0 (diff) | |
| parent | 1c881026a1eebadd1eae8cc3a4418b010df35bee (diff) | |
| download | git-6eea44cee1dc94a7d6f7fa768d5710f9385f22db.zip git-6eea44cee1dc94a7d6f7fa768d5710f9385f22db.tar.gz git-6eea44cee1dc94a7d6f7fa768d5710f9385f22db.tar.bz2 | |
Merge branch 'zh/difftool-skip-to'
"git difftool" learned "--skip-to=<path>" option to restart an
interrupted session from an arbitrary path.
* zh/difftool-skip-to:
difftool.c: learn a new way start at specified file
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-difftool.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 484c485..143b0c4 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -34,6 +34,14 @@ OPTIONS This is the default behaviour; the option is provided to override any configuration settings. +--rotate-to=<file>:: + Start showing the diff for the given path, + the paths before it will move to end and output. + +--skip-to=<file>:: + Start showing the diff for the given path, skipping all + the paths before it. + -t <tool>:: --tool=<tool>:: Use the diff tool specified by <tool>. Valid values include |