git-gui: Fast-forward existing branch in branch create dialog

[git.git] / lib / commit.tcl

diff --git a/lib/commit.tcl b/lib/commit.tcl
index f9791f64dbec927726622f3d0a368606a4f13b17..0de2a28fa5e031bd6c3a090f9288527aed78b188 100644 (file)
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -331,7 +331,12 @@ A rescan will be automatically started now.
 
        # -- Let rerere do its thing.
        #
-       if {[file isdirectory [gitdir rr-cache]]} {
+       if {[get_config rerere.enabled] eq {}} {
+               set rerere [file isdirectory [gitdir rr-cache]]
+       } else {
+               set rerere [is_config_true rerere.enabled]
+       }
+       if {$rerere} {
                catch {git rerere}
        }