![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2011 19:19:11 +0000 (12:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2011 19:19:11 +0000 (12:19 -0700) | ||
| commit | f67d2e82d6d2fd385d3d20e8d348eaf69dc95041 | |
| tree | e1c16bbf610d405e77443f51f121d857d44eba0b | tree | snapshot |
| parent | 1c9d71944a7a35cdfeb09200b20e261737cdc0b9 | commit | diff |
| parent | 9553d2b26395d9a19bf60875784661090f607f4a | commit | diff |
Merge branch 'jk/format-patch-am'
* 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
* 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
| builtin/branch.c | diff1 | | diff2 | | blob | history |
| builtin/checkout.c | diff1 | | diff2 | | blob | history |
| builtin/log.c | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| builtin/rev-list.c | diff1 | | diff2 | | blob | history |
| builtin/shortlog.c | diff1 | | diff2 | | blob | history |
| builtin/show-branch.c | diff1 | | diff2 | | blob | history |
| commit.h | diff1 | | diff2 | | blob | history |
| log-tree.c | diff1 | | diff2 | | blob | history |
| pretty.c | diff1 | | diff2 | | blob | history |
| revision.h | diff1 | | diff2 | | blob | history |