aboutsummaryrefslogtreecommitdiffstats
path: root/config/config.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2019-05-20 00:16:19 +0200
committerGitHub <noreply@github.com>2019-05-20 00:16:19 +0200
commit91db86b5c1068539f3c64d536f8af80503234f41 (patch)
treee1f1745266b9512cfa7cb15200188bc38f19dedb /config/config.go
parent7bdcd80a8c4ff0dab240d603258ba60b28102683 (diff)
parentf284cd4c2f97e3143e70e64cad4e6f490a6b49f1 (diff)
downloadgo-git-91db86b5c1068539f3c64d536f8af80503234f41.tar.gz
Merge pull request #1154 from yelirekim/rebase_config
Support the 'rebase' config key for branches
Diffstat (limited to 'config/config.go')
-rw-r--r--config/config.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.go b/config/config.go
index 2c3b8b9..ea614e9 100644
--- a/config/config.go
+++ b/config/config.go
@@ -120,6 +120,7 @@ const (
commentCharKey = "commentChar"
windowKey = "window"
mergeKey = "merge"
+ rebaseKey = "rebase"
// DefaultPackWindow holds the number of previous objects used to
// generate deltas. The value 10 is the same used by git command.