diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:40:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:40:26 -0800 |
| commit | 6d975c24a96d607061dbcf354a50dc8410ed4b55 (patch) | |
| tree | c94dcb149e3caa50db08c5b4fe4d360844e13a13 /builtin-merge-recursive.c | |
| parent | 4075d27a65e00e8eb5124b70a37f6d25c5b14d35 (diff) | |
| parent | d25e51596be9271ad833805a3d6f9012dc24ee79 (diff) | |
Merge branch 'ls/maint-mailinfo-no-inbody'
* ls/maint-mailinfo-no-inbody:
git am/mailinfo: Don't look at in-body headers when rebasing
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions