Rename "encoding" option to "commit-encoding"

diff --git a/tig.c b/tig.c
index cb943bc8e4077f2f39888c23b6246296e2024020..f6efeb3bad0110d2562f41ede778a8b0a6f72bed 100644 (file)
--- 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 fa08c5badc725ff2a19a99bcc0f984afeac50391..58e045667a7a0c0bf3708de9048ea166c4685ef6 100644 (file)
--- 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