diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-18 15:07:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 15:07:24 -0700 |
| commit | 4789576e0e5364dcd3916ef583b2ea61bef23f24 (patch) | |
| tree | ebab4df7bc88e09c770bcbafe3a4c0b3cec74fc3 /commit-tree.c | |
| parent | ff69ab9ad87d839e381b1e4abfe45032d18bada7 (diff) | |
| download | git-4789576e0e5364dcd3916ef583b2ea61bef23f24.tar.gz | |
[PATCH] show-diff.c: -R option for reverse diff.
This adds -R option to obtain reverse diff.
It may be useful in the merge workflow. After the base of the working
directory is merged and commited, in the working directory:
$ read-tree <tree-id-of-merged-tree>
$ show-diff -R
to re-validate if upstream changes make sense, and/or revert or
conflict with local changes you have in the working files.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'commit-tree.c')
0 files changed, 0 insertions, 0 deletions