summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-19 23:36:55 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-28 13:55:56 -0800
commitc5a589740601789dc5af3790885c3d21e09cc6a4 (patch)
treea6cc65ea3316e5ef4724b4d449f446887b5fd145 /Documentation
parente325bf7d045de2976cc3c048922f1b727a468d41 (diff)
downloadgit-jc/diff-ignore-case.tar.gz
diff: -i is "--ignore-case" but means a bit more in "log"jc/diff-ignore-case
The previous patch to teach "--ignore-case" option to our "diff" machinery deliberately omitted a short-and-sweet "-i" that GNU diff uses to ask for "--ignore-case". This is because our diff machinery is often used by and shares the command line options with the commands in the "git log" family, where the short option already means something entirely different. Namely, it instructs us to use case-insensitive match when looking for commits that match strings that appear in the commit object itself, e.g. --author and --grep. Tweak the option parser so that "-i" means both, so that $ git log --grep=frotz -i -p first picks commits that have string "frotz" in any combination of cases, and then shows patches that ignore case-only changes for them, while "--ignore-case" and "--regexp-ignore-case" can be used to mean only one, that is: $ git log --grep=frotz --regexp-ignore-case -p would pick the same set of commits, but the patches shown by it does not ignore case-only changes while: $ git log --grep=frotz --ignore-case -p would pick commits that has "frotz" in all lowercase, but shows patches that ignore case-only changes for the chosen commits. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 791e07feaf..9ed78c9962 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -404,6 +404,7 @@ endif::git-format-patch[]
differences even if one line has whitespace where the other
line has none.
+-i::
--ignore-case::
Ignore changes in case only; only ASCII alphabet is supported for
now.