rewording

4 files changed, 8 insertions, 9 deletions

diff --git a/etckeeper b/etckeeper
index a9cf577..dfd44bb 100755
--- a/etckeeper
+++ b/etckeeper
@@ -5,8 +5,8 @@ if [ -e /etc/etckeeper/etckeeper.conf ]; then
 	. /etc/etckeeper/etckeeper.conf
 fi
 
-if [ ! -z "$GIT_COMMIT_OPTION" ]; then
-	export GIT_COMMIT_OPTION
+if [ ! -z "$GIT_COMMIT_OPTIONS" ]; then
+	export GIT_COMMIT_OPTIONS
 fi
 
 if [ -z "$1" ]; then
diff --git a/etckeeper.conf b/etckeeper.conf
index 6941e10..74bb34a 100644
--- a/etckeeper.conf
+++ b/etckeeper.conf
@@ -1,5 +1,4 @@
-# GIT_COMMIT_OPTION : option given to git commit when run by etckeeper 
-# you could for exemple use GIT_COMMIT_OPTION="-e" if you want to edit
-# all commit message before commiting
-
-# GIT_COMMIT_OPTION=""
+# Options passed to git commit when run by etckeeper.
+# You could for exemple use "-e" if you want to edit all commit messages
+# before committing.
+#GIT_COMMIT_OPTIONS="-e"
diff --git a/post-apt.d/50git-commit b/post-apt.d/50git-commit
index fe5eb95..1a5c55a 100755
--- a/post-apt.d/50git-commit
+++ b/post-apt.d/50git-commit
@@ -8,5 +8,5 @@ if [ -d .git ]; then
 	message="committing changes after apt run"
 
 	# ignore exit code since it exits nonzero if there is nothing to do
-	git commit $GIT_COMMIT_OPTION -m "$message" || true
+	git commit $GIT_COMMIT_OPTIONS -m "$message" || true
 fi
diff --git a/pre-apt.d/50uncommitted-changes b/pre-apt.d/50uncommitted-changes
index eb3a64d..d39401c 100755
--- a/pre-apt.d/50uncommitted-changes
+++ b/pre-apt.d/50uncommitted-changes
@@ -12,7 +12,7 @@ if [ -d .git ] && ! LANG=C git-status 2>&1 | grep -q "working directory clean";
 	db_get etckeeper/unclean
 	if [ "$RET" = true ]; then
 		git add .
-		if ! git commit $GIT_COMMIT_OPTION -m "saving uncommitted changes in /etc prior to apt run"; then
+		if ! git commit $GIT_COMMIT_OPTIONS -m "saving uncommitted changes in /etc prior to apt run"; then
 			db_input critical etckeeper/commit_failed || true
 			db_go || true
 			db_reset etckeeper/commit_failed || true