diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-21 01:34:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-21 01:34:54 -0700 |
| commit | 328b710d800dc3786fe2b8595e5553dc4a4af424 (patch) | |
| tree | 451935aff364f1fd65340dbb79242780f04ea87a /combine-diff.c | |
| parent | e686eb9870d6b382f0760e3e859e93c8c2dfb31b (diff) | |
| parent | 8824689884a5673f803d77cda499f83b84145a06 (diff) | |
| download | git-328b710d800dc3786fe2b8595e5553dc4a4af424.tar.gz git-328b710d800dc3786fe2b8595e5553dc4a4af424.tar.xz | |
Merge branch 'master' into js/fmt-patch
* master: (119 commits)
diff family: add --check option
Document that "git add" only adds non-ignored files.
Add a conversion tool to migrate remote information into the config
fetch, pull: ask config for remote information
Fix build procedure for builtin-init-db
read-tree -m -u: do not overwrite or remove untracked working tree files.
apply --cached: do not check newly added file in the working tree
Implement a --dry-run option to git-quiltimport
Implement git-quiltimport
Revert "builtin-grep: workaround for non GNU grep."
builtin-grep: workaround for non GNU grep.
builtin-grep: workaround for non GNU grep.
git-am: use apply --cached
apply --cached: apply a patch without using working tree.
apply --numstat: show new name, not old name.
Documentation/Makefile: create tarballs for the man pages and html files
Allow pickaxe and diff-filter options to be used by git log.
Libify the index refresh logic
Builtin git-init-db
Remove unnecessary local in get_ref_sha1.
...
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); |