Merge branch 'mg/pretty-magic-space'

* mg/pretty-magic-space:
  pretty: Introduce ' ' modifier to add space if non-empty

Conflicts:
	pretty.c

diff --cc pretty.c
index 4b85373,9e845dc..f85444b
--- 1/pretty.c
--- 2/pretty.c
+++ b/pretty.c
@@@ -941,7 -941,8 +941,8 @@@ static size_t format_commit_item(struc
        enum {
                NO_MAGIC,
                ADD_LF_BEFORE_NON_EMPTY,
-               DEL_LF_BEFORE_EMPTY
+               DEL_LF_BEFORE_EMPTY,
 -              ADD_SP_BEFORE_NON_EMPTY,
++              ADD_SP_BEFORE_NON_EMPTY
        } magic = NO_MAGIC;
  
        switch (placeholder[0]) {