Merge branch 'py/reload-config' into j6t-testing

* py/reload-config:
  git-gui: update in-memory config when changing config options

Author: j6t

lib/option.tcl

@@ -333,6 +333,7 @@ proc do_save_config {w} {
 	if {[catch {save_config} err]} {
 		error_popup [strcat [mc "Failed to completely save options:"] "\n\n$err"]
 	}
+	load_config 1
 	reshow_diff
 	destroy $w
 }