summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-05-13 20:23:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-14 23:26:27 (GMT)
commitee1e5412a702674d4da95a4aef73a73d2834dcc3 (patch)
tree37b17f11a316e40697f92be515fba733017f84b2 /combine-diff.c
parent975bf9cf5ad5d440f98f464ae8124609a4835ce1 (diff)
downloadgit-ee1e5412a702674d4da95a4aef73a73d2834dcc3.zip
git-ee1e5412a702674d4da95a4aef73a73d2834dcc3.tar.gz
git-ee1e5412a702674d4da95a4aef73a73d2834dcc3.tar.bz2
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 'combine-diff.c')
-rw-r--r--combine-diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 8a8fe38..64b20cc 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -608,6 +608,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV;
mmfile_t result_file;
+ context = opt->context;
/* Read the result of merge first */
if (!working_tree_file)
result = grab_blob(elem->sha1, &result_size);