mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/format-patch-am'

Browse Source 
* jk/format-patch-am:
  format-patch: preserve subject newlines with -k
  clean up calling conventions for pretty.c functions
  pretty: add pp_commit_easy function for simple callers
  mailinfo: always clean up rfc822 header folding
  t: test subject handling in format-patch / am pipeline

Conflicts:
	builtin/branch.c
	builtin/log.c
	commit.h
This commit is contained in:
Junio C Hamano
2011-05-31 12:19:11 -07:00
parent 1c9d71944a 9553d2b263
commit f67d2e82d6
13 changed files with 174 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
revision.h
View File

@ -94,7 +94,8 @@ struct rev_info {
abbrev_commit_given:1,
use_terminator:1,
missing_newline:1,
date_mode_explicit:1;
date_mode_explicit:1,
preserve_subject:1;
unsigned int disable_stdin:1;
enum date_mode date_mode;