diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-06 00:21:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-06 00:21:03 -0700 |
| commit | 125a5f1c2a93f217e92dd88210c2cb503032c02f (patch) | |
| tree | adfe643504e7bfa6b3bdaf47b9ff5df3d5ba7349 /log-tree.c | |
| parent | cc0e6c5adc783bcb29954f3a0b7a6197bcc9b1b3 (diff) | |
| parent | e102d4353d7cfd69a597cd976eabdcb74641be69 (diff) | |
| download | git-125a5f1c2a93f217e92dd88210c2cb503032c02f.tar.gz | |
Merge branch 'maint'
* maint:
Small correction in reading of commit headers
Documentation: fix typo in git-remote.txt
Add test for blame corner cases.
blame: -C -C -C
blame: Notice a wholesale incorporation of an existing file.
Fix --boundary output
diff format documentation: describe raw combined diff format
Mention version 1.5.1 in tutorial and user-manual
Add --no-rebase option to git-svn dcommit
Fix markup in git-svn man page
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/log-tree.c b/log-tree.c index c679324c07..4bef909144 100644 --- a/log-tree.c +++ b/log-tree.c @@ -244,10 +244,10 @@ void show_log(struct rev_info *opt, const char *sep) stdout); if (opt->commit_format != CMIT_FMT_ONELINE) fputs("commit ", stdout); - if (opt->left_right) { - if (commit->object.flags & BOUNDARY) - putchar('-'); - else if (commit->object.flags & SYMMETRIC_LEFT) + if (commit->object.flags & BOUNDARY) + putchar('-'); + else if (opt->left_right) { + if (commit->object.flags & SYMMETRIC_LEFT) putchar('<'); else putchar('>'); |