diff options
| author |  Heiko Voigt <hvoigt@hvoigt.net> | 2010-07-14 13:59:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-14 08:47:29 -0700 |
| commit | dd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79 (patch) | |
| tree | 6689ef65a903c6ba9e4e765ee9135c5902cbf7d6 /Documentation/config.txt | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-dd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79.tar.xz | |
add configuration variable for --autosquash option of interactive rebase
If you use this feature regularly you can now enable it by default. In
case the user wants to override this config on the commandline
--no-autosquash can be used to force disabling.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 79d54e546a..9e3c48bd8c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1533,6 +1533,9 @@ rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. +rebase.autosquash:: + If set to true enable '--autosquash' option by default. + receive.autogc:: By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop |