Git development
 help / color / mirror / Atom feed
From: Stephan Feder <sf@b-i-t.de>
To: git@vger.kernel.org
Subject: [PATCH 3/3] diff-options: Explain --text and -a
Date: Fri, 07 Jul 2006 15:57:09 +0200	[thread overview]
Message-ID: <11522806292890-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>
---
 Documentation/diff-options.txt |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f523ec2..1a93629 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -94,5 +94,11 @@
 	Swap two inputs; that is, show differences from index or
 	on-disk file to tree contents.
 
+--text::
+	Treat all files as text.
+
+-a::
+	Shorthand for "--text".
+
 For more detailed explanation on these common options, see also
 link:diffcore.html[diffcore documentation].
-- 
1.4.1.gbc483

      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     ` [PATCH 2/3] Add -a and --text to common diff options help Stephan Feder
2006-07-07 13:57     ` Stephan Feder [this message]

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=11522806292890-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