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 /combine-diff.c | |
| parent | 975bf9cf5ad5d440f98f464ae8124609a4835ce1 (diff) | |
| download | git-ee1e5412a702674d4da95a4aef73a73d2834dcc3.tar.gz git-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 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index 8a8fe3863..64b20cce2 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); |