diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:19:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:19:11 -0700 |
| commit | f67d2e82d6d2fd385d3d20e8d348eaf69dc95041 (patch) | |
| tree | e1c16bbf610d405e77443f51f121d857d44eba0b /Documentation/git-merge-base.txt | |
| parent | Merge branch 'jn/doc-remote-helpers' (diff) | |
| parent | format-patch: preserve subject newlines with -k (diff) | |
| download | tgif-f67d2e82d6d2fd385d3d20e8d348eaf69dc95041.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions