Merge branch 'sb/format-patch-patchname'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Apr 2009 07:42:23 +0000 (00:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Apr 2009 07:42:23 +0000 (00:42 -0700)
* sb/format-patch-patchname:
format_sanitized_subject: Don't trim past initial length of strbuf
log-tree: fix patch filename computation in "git format-patch"
format-patch: --numbered-files and --stdout aren't mutually exclusive
format-patch: --attach/inline uses filename instead of SHA1
format-patch: move get_patch_filename() into log-tree
format-patch: pass a commit to reopen_stdout()
format-patch: construct patch filename in one function
pretty.c: add %f format specifier to format_commit_message()

1  2 
builtin-log.c
revision.h
diff --cc builtin-log.c
Simple merge
diff --cc revision.h
Simple merge