Andrew's git / gitweb.git / diff
?
Merge branch 'bg/format-patch-doc-update'
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:47:10 +0000 (23:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:47:10 +0000 (23:47 -0800)
* bg/format-patch-doc-update:
format-patch: Add "--no-stat" as a synonym for "-p"
format-patch documentation: Fix formatting
format-patch documentation: Remove diff options that are not useful
format-patch: Always generate a patch

1  2 
Documentation/diff-options.txt patch | diff1 | diff2 | blob | history
builtin-log.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/diff-options.txt
Simple merge
diff --cc builtin-log.c
Simple merge