summaryrefslogtreecommitdiff
path: root/column.c
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 15:11:46 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 15:29:27 -0700
commit01689909eb9f8366583c44b325d8d9ba259a2538 (patch)
tree6a4635a267885b3429f55c81a9a1c8787e36802e /column.c
parente34b272344c1e7eb640dcce5990a75460240daed (diff)
downloadgit-01689909eb9f8366583c44b325d8d9ba259a2538.tar.gz
comments: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'column.c')
-rw-r--r--column.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/column.c b/column.c
index 9367ba5db5..8d1ce88d14 100644
--- a/column.c
+++ b/column.c
@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char *value)
value += strspn(value, sep);
}
/*
- * Setting layout implies "always" if neither always, never
- * nor auto is specified.
+ * If none of "always", "never", and "auto" is specified, then setting
+ * layout implies "always".
*
* Current value in COL_ENABLE_MASK is disregarded. This means if
* you set column.ui = auto and pass --column=row, then "auto"