git diff: support "-U" and "--unified" options properly
authorLinus Torvalds <torvalds@osdl.org>
Sat, 13 May 2006 20:23:48 +0000 (13:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:26:27 +0000 (16:26 -0700)
commitee1e5412a702674d4da95a4aef73a73d2834dcc3
tree37b17f11a316e40697f92be515fba733017f84b2
parent975bf9cf5ad5d440f98f464ae8124609a4835ce1
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>
combine-diff.c
diff.c
diff.h