diff options
author | Linus Torvalds <torvalds@osdl.org> | 2006-05-13 13:23:48 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 16:26:27 -0700 |
commit | ee1e5412a702674d4da95a4aef73a73d2834dcc3 (patch) | |
tree | 37b17f11a316e40697f92be515fba733017f84b2 /git-request-pull.sh | |
parent | Merge branch 'fix' (diff) | |
download | tgif-ee1e5412a702674d4da95a4aef73a73d2834dcc3.tar.xz |
git diff: support "-U" and "--unified" options properly
We used to parse "-U" and "--unified" as part of the GIT_DIFF_OPTS
environment variable, but strangely enough we would _not_ parse them as
part of the normal diff command line (where we only accepted "-u").
This adds parsing of -U and --unified, both with an optional numeric
argument. So now you can just say
git diff --unified=5
to get a unified diff with a five-line context, instead of having to do
something silly like
GIT_DIFF_OPTS="--unified=5" git diff -u
(that silly format does continue to still work, of course).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-request-pull.sh')
0 files changed, 0 insertions, 0 deletions