Merge branch 'jc/diff-irreversible-delete'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:11:47 +0000 (14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:11:47 +0000 (14:11 -0700)
* jc/diff-irreversible-delete:
  git diff -D: omit the preimage of deletes

1  2 
Documentation/diff-options.txt
diff.c
diff.h

Simple merge
diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge