summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-18 23:40:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-22 23:20:16 -0700
commit00d3947366a50a06da40989a1fd1e3f99885a4c3 (patch)
treee6a9df8e22bee1b5cec207379b358daf0399271f /contrib/examples/git-merge-ours.sh
parentAdd strbuf_add_wrapped_text() to utf8.[ch] (diff)
downloadtgif-00d3947366a50a06da40989a1fd1e3f99885a4c3.tar.xz
Teach --wrap to only indent without wrapping
When a zero or negative width is given to "shortlog -w<width>,<in1>,<in2>" and --format=%[wrap(w,in1,in2)...%], just indent the text by in1 without wrapping. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions