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 /diff.h | |
parent | 74f6b03c5c8fceef416de9f9a18e5d64712b6d96 (diff) | |
download | git-eab9a40b6dd5c1c571b1deb264133db47bb4794d.tar.gz git-eab9a40b6dd5c1c571b1deb264133db47bb4794d.tar.xz |
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 'diff.h')
-rw-r--r-- | diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -69,6 +69,7 @@ struct diff_options { const char *orderfile; const char *pickaxe; const char *single_follow; + const char *a_prefix, *b_prefix; unsigned flags; int context; int break_opt; |