summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 20:38:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-06 20:38:12 (GMT)
commitf2140c3890780301760ee290f21be01f61726221 (patch)
treefe441f41a0fa1c572c3f672fb2abdac32c61966a /commit.h
parent979f030359f6830fbaebd0c76e9aad5f86993fef (diff)
parent066790d7cb0fa22e64f1276d8a0e33d18484f62a (diff)
downloadgit-f2140c3890780301760ee290f21be01f61726221.zip
git-f2140c3890780301760ee290f21be01f61726221.tar.gz
git-f2140c3890780301760ee290f21be01f61726221.tar.bz2
Merge branch 'nd/graph-width-padded'
"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)'
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 1e04d3a..78ed513 100644
--- a/commit.h
+++ b/commit.h
@@ -167,6 +167,7 @@ struct pretty_print_context {
* should not be counted on by callers.
*/
struct string_list in_body_headers;
+ int graph_width;
};
struct userformat_want {