]> git.ipfire.org Git - thirdparty/git.git/commit
[PATCH] show-diff.c: -R option for reverse diff.
authorJunio C Hamano <junkio@cox.net>
Mon, 18 Apr 2005 22:07:24 +0000 (15:07 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 22:07:24 +0000 (15:07 -0700)
commit4789576e0e5364dcd3916ef583b2ea61bef23f24
treeebab4df7bc88e09c770bcbafe3a4c0b3cec74fc3
parentff69ab9ad87d839e381b1e4abfe45032d18bada7
[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>
show-diff.c