diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:30:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:30:07 -0700 |
| commit | e69a6f47c4e25a20170eb989a55257d0399f795b (patch) | |
| tree | 4891b8d55a9d188ad695c7da5c35c3744d1909b6 /diff-lib.c | |
| parent | c4398286fa5245cf54d73f6016444179d73f140b (diff) | |
| parent | a5a818ee4877e4458e8e6741a03ac3b19941d58a (diff) | |
| download | git-e69a6f47c4e25a20170eb989a55257d0399f795b.tar.gz | |
Merge branch 'jc/diff-prefix'
* jc/diff-prefix:
diff: vary default prefix depending on what are compared
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c index e7eaff9a68..ae96c64ca2 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -63,6 +63,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option) ? CE_MATCH_RACY_IS_DIRTY : 0); char symcache[PATH_MAX]; + diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"); + if (diff_unmerged_stage < 0) diff_unmerged_stage = 2; entries = active_nr; @@ -469,6 +471,7 @@ int run_diff_index(struct rev_info *revs, int cached) if (unpack_trees(1, &t, &opts)) exit(128); + diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/"); diffcore_std(&revs->diffopt); diff_flush(&revs->diffopt); return 0; |