]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'nd/graph-width-padded'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:12 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:12 +0000 (13:38 -0700)
"log --graph --format=" learned that "%>|(N)" specifies the width
relative to the terminal's left edge, not relative to the area to
draw text that is to the right of the ancestry-graph section.  It
also now accepts negative N that means the column limit is relative
to the right border.

* nd/graph-width-padded:
  pretty.c: support <direction>|(<negative number>) forms
  pretty: pass graph width to pretty formatting for use in '%>|(N)'

1  2 
commit.h
log-tree.c
pretty.c

diff --cc commit.h
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc pretty.c
Simple merge