From cb7267eefe872b5f62559405ba1bda059867b776 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 8 Jun 2006 15:30:12 +0200
Subject: [PATCH] Rename "encoding" option to "commit-encoding"

---
 tig.c | 2 +-
 tigrc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tig.c b/tig.c
index cb943bc..f6efeb3 100644
--- a/tig.c
+++ b/tig.c
@@ -949,7 +949,7 @@ option_set_command(int argc, char *argv[])
 		return OK;
 	}
 
-	if (!strcmp(argv[0], "encoding")) {
+	if (!strcmp(argv[0], "commit-encoding")) {
 		string_copy(opt_encoding, argv[2]);
 		return OK;
 	}
diff --git a/tigrc b/tigrc
index fa08c5b..58e0456 100644
--- a/tigrc
+++ b/tigrc
@@ -6,7 +6,7 @@
 set show-rev-graph = yes	# Show revision graph?
 set line-number-interval = 5	# Interval between line numbers
 set tab-size = 8		# Number of spaces pr tab 
-set encoding = UTF-8		# Commit encoding
+set commit-encoding = UTF-8	# Commit encoding
 
 #
 # Key configuration
-- 
2.30.2