From: Stephan Feder <sf@b-i-t.de>
To: git@vger.kernel.org
Subject: [PATCH 2/3] Add -a and --text to common diff options help
Date: Fri, 07 Jul 2006 15:57:08 +0200 [thread overview]
Message-ID: <11522806292871-git-send-email-sf@b-i-t.de> (raw)
In-Reply-To: <44AE4B35.6060607@b-i-t.de>
Signed-off-by: Stephan Feder <sf@b-i-t.de>
---
diff.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/diff.h b/diff.h
index f80f646..8ab0448 100644
--- a/diff.h
+++ b/diff.h
@@ -162,7 +162,8 @@ #define COMMON_DIFF_OPTIONS_HELP \
" -O<file> reorder diffs according to the <file>.\n" \
" -S<string> find filepair whose only one side contains the string.\n" \
" --pickaxe-all\n" \
-" show all files diff when -S is used and hit is found.\n"
+" show all files diff when -S is used and hit is found.\n" \
+" -a --text treat all files as text.\n"
extern int diff_queue_is_empty(void);
extern void diff_flush(struct diff_options*);
--
1.4.1.gbc483
next prev parent reply other threads:[~2006-07-07 13:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-07 10:33 [PATCH] Teach --text option to diff Stephan Feder
2006-07-07 11:06 ` Junio C Hamano
2006-07-07 11:53 ` sf
2006-07-07 13:57 ` [PATCH 1/3] Teach diff -a as shorthand for --text Stephan Feder
2006-07-07 13:57 ` Stephan Feder [this message]
2006-07-07 13:57 ` [PATCH 3/3] diff-options: Explain --text and -a Stephan Feder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11522806292871-git-send-email-sf@b-i-t.de \
--to=sf@b-i-t.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox