Git development
 help / color / mirror / Atom feed
From: Stephan Feder <sf@b-i-t.de>
To: git@vger.kernel.org
Subject: [PATCH 1/3] Teach diff -a as shorthand for --text
Date: Fri, 07 Jul 2006 15:57:07 +0200	[thread overview]
Message-ID: <11522806291956-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.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/diff.c b/diff.c
index 1f0219d..b423491 100644
--- a/diff.c
+++ b/diff.c
@@ -1561,7 +1561,7 @@ int diff_opt_parse(struct diff_options *
 		options->output_format |= DIFF_FORMAT_PATCH;
 		options->full_index = options->binary = 1;
 	}
-	else if (!strcmp(arg, "--text")) {
+	else if (!strcmp(arg, "-a") || !strcmp(arg, "--text")) {
 		options->text = 1;
 	}
 	else if (!strcmp(arg, "--name-only"))
-- 
1.4.1.gbc483

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