diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-08-10 00:50:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-10 00:50:15 -0700 |
| commit | 306ea2df03322ac8c29f4eb5a968acb7ef3c8f72 (patch) | |
| tree | f557ab77e52d589377e51d52d2f389bc76da908d | |
| parent | combine-diff: use color (diff) | |
| download | tgif-306ea2df03322ac8c29f4eb5a968acb7ef3c8f72.tar.xz | |
Fix git-diff A...B
Commit 9919f41 meant to make git-diff A...B to (usually) mean
"git-diff `git-merge-base A B` B", but it got the parameters wrong
and ended up showing "git-diff `git-merge-base A B` A" by mistake.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index dd9886c6e8..a090e298a5 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -349,6 +349,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) * A and B. We have ent[0] == merge-base, ent[1] == A, * and ent[2] == B. Show diff between the base and B. */ + ent[1] = ent[2]; return builtin_diff_tree(&rev, argc, argv, ent); } else |