| commit | d4c5307701551ec65c10bef0dacc643205313098 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 8 Jul 2007 21:41:24 +0000 (8 17:41 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 8 Jul 2007 21:41:24 +0000 (8 17:41 -0400) | ||
| tree | 2037e246c9c1c8b3fbfcbb60151cf81bf78e9588 | treesnapshot (tar.gz zip) |
| parent | f8186e92e3399ddd742f2397e802467cabf2849f | commitdiff |
git-gui: Honor rerere.enabled configuration option
Recently in git.git change b4372ef136 Johannes Schindelin taught
git-commit.sh to invoke (or skip) calling git-rerere based upon
the rerere.enabled configuration setting:
So, check the config variable "rerere.enabled". If it is set
to "false" explicitely, do not activate rerere, even if
.git/rr-cache exists. This should help when you want to disable
rerere temporarily.
If "rerere.enabled" is not set at all, fall back to detection
of the directory .git/rr-cache.
We now do the same logic in git-gui's own commit implementation.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Recently in git.git change b4372ef136 Johannes Schindelin taught
git-commit.sh to invoke (or skip) calling git-rerere based upon
the rerere.enabled configuration setting:
So, check the config variable "rerere.enabled". If it is set
to "false" explicitely, do not activate rerere, even if
.git/rr-cache exists. This should help when you want to disable
rerere temporarily.
If "rerere.enabled" is not set at all, fall back to detection
of the directory .git/rr-cache.
We now do the same logic in git-gui's own commit implementation.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| lib/commit.tcl | diffblobblamehistory |