diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:28:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:28:40 -0700 |
| commit | 22fcbc420e7948cadb42c923810609a5e4b730a4 (patch) | |
| tree | 98af691dffb868dcce816e514e6fd81220ffdc7b /builtin/merge.c | |
| parent | Merge branch 'mv/merge-ff-tristate' (diff) | |
| parent | teach format-patch to place other authors into in-body "From" (diff) | |
| download | tgif-22fcbc420e7948cadb42c923810609a5e4b730a4.tar.xz | |
Merge branch 'jk/format-patch-from'
"git format-patch" learned "--from[=whom]" option, which sets the
"From: " header to the specified person (or the person who runs the
command, if "=whom" part is missing) and move the original author
information to an in-body From: header as necessary.
* jk/format-patch-from:
teach format-patch to place other authors into in-body "From"
pretty.c: drop const-ness from pretty_print_context
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions