summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-03-10 23:38:18 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-10 23:38:18 -0800
commit8a3fbdd9e6c37c74b12fd0e8bd7cde8372861288 (patch)
treeb5c2cd69063409beb852841792fbf0ed41d12278 /merge-index.c
parentMerge branch 'js/diff-ni' (diff)
parentformat-patch --attach: not folding some long headers. (diff)
downloadtgif-8a3fbdd9e6c37c74b12fd0e8bd7cde8372861288.tar.xz
Merge branch 'js/attach'
* js/attach: format-patch --attach: not folding some long headers. format-patch: add --inline option and make --attach a true attachment
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions