Merge branch 'jc/fetchupload' into next

diff --git a/log-tree.c b/log-tree.c
index 7e23e42788986257b9c108bcd340460a60a0cf88..58b016378c153db0063dee556e1e4bacf64c6aed 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -100,7 +100,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
                       diff_unique_abbrev(commit->object.sha1, abbrev_commit));
                if (opt->parents)
                        show_parents(commit, abbrev_commit);
-               if (parent) 
+               if (parent)
                        printf(" (from %s)",
                               diff_unique_abbrev(parent->object.sha1,
                                                  abbrev_commit));