From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jun 2010 16:45:22 +0000 (-0700)
Subject: Merge branch 'mg/pretty-magic-space'
X-Git-Tag: v1.7.2-rc0~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=223a923c37f76ee91eb6a9cb77ce6d31dcf939cc;p=git.git

Merge branch 'mg/pretty-magic-space'

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

Conflicts:
	pretty.c
---

223a923c37f76ee91eb6a9cb77ce6d31dcf939cc
diff --cc pretty.c
index 4b85373ba,9e845dcb0..f85444b27
--- a/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]) {