diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-12-18 19:32:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-20 01:10:39 -0800 |
| commit | eab9a40b6dd5c1c571b1deb264133db47bb4794d (patch) | |
| tree | 792cbe7fec4bf5018d85bbef4d98d2b24db5fd96 /Documentation/diff-options.txt | |
| parent | 74f6b03c5c8fceef416de9f9a18e5d64712b6d96 (diff) | |
| download | git-eab9a40b6dd5c1c571b1deb264133db47bb4794d.tar.gz | |
Teach diff machinery to display other prefixes than "a/" and "b/"
With the new options "--src-prefix=<prefix>", "--dst-prefix=<prefix>"
and "--no-prefix", you can now control the path prefixes of the diff
machinery. These used to by hardwired to "a/" for the source prefix
and "b/" for the destination prefix.
Initial patch by Pascal Obry. Sane option names suggested by Linus.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 9ecc1d7bc4..1a78635fba 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -211,5 +211,14 @@ endif::git-format-patch[] --no-ext-diff:: Disallow external diff drivers. +--src-prefix=<prefix>:: + Show the given source prefix instead of "a/". + +--dst-prefix=<prefix>:: + Show the given destination prefix instead of "b/". + +--no-prefix:: + Do not show any source or destination prefix. + For more detailed explanation on these common options, see also link:diffcore.html[diffcore documentation]. |