From: Eric Wong Date: Fri, 08 Dec 2006 10:49:30 GMT Subject: [PATCH 5/5] rerere: add the diff command Message-ID: <1165574977365-git-send-email-normalperson@yhbt.net> In-Reply-To: <20061205092126.GE27236@soma> Sometimes I like to see what I'm recording resolutions for and what's changed during a resolution. Signed-off-by: Eric Wong --- git-rerere.perl | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/git-rerere.perl b/git-rerere.perl index b78194a..7a3ae84 100755 --- a/git-rerere.perl +++ b/git-rerere.perl @@ -186,6 +186,13 @@ if (my $arg = shift @ARGV) { for my $path (keys %merge_rr) { print $path, "\n"; } + } elsif ($arg eq 'diff') { + for my $path (keys %merge_rr) { + my $name = $merge_rr{$path}; + system(qw/diff/, @ARGV, + '-L', "a/$path", '-L', "b/$path", + "$rr_dir/$name/preimage", $path); + } } exit 0; } -- 1.4.4.2.g860f4