diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-10 00:14:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-10 00:14:50 -0700 |
| commit | 6972ab7ae10a205bbc05b98408a36403915a9c39 (patch) | |
| tree | 755ab51db764a7d35e9546eb30a5d4440291b014 /git-merge.sh | |
| parent | 9784c5c53e0765bc9a0c973ab10aaf0734d535c3 (diff) | |
| parent | 20fbfd869fe8faae0ce4573b60b540024db7385d (diff) | |
| download | git-6972ab7ae10a205bbc05b98408a36403915a9c39.tar.gz git-6972ab7ae10a205bbc05b98408a36403915a9c39.tar.xz | |
Merge branch 'rs/archive'
* rs/archive:
archive - leakfix for format_subst()
Define NO_MEMMEM on Darwin as it lacks the function
archive: rename attribute specfile to export-subst
archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
add memmem()
Remove unused function convert_sha1_file()
archive: specfile support (--pretty=format: in archive files)
Export format_commit_message()
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions