diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:15:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:15:03 -0700 |
| commit | a621859101370205d89a6fea7ba17839a43eb4ab (patch) | |
| tree | 5b765708864a2e0ab0bf79c216e2e58c5fbe6029 /Documentation/config.txt | |
| parent | e24058f57f4e76e38e20390c5927590f3cd48085 (diff) | |
| parent | dd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79 (diff) | |
| download | git-a621859101370205d89a6fea7ba17839a43eb4ab.tar.gz git-a621859101370205d89a6fea7ba17839a43eb4ab.tar.xz | |
Merge branch 'hv/autosquash-config'
* hv/autosquash-config:
add configuration variable for --autosquash option of interactive rebase
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 05ec3fed8..19b6dc6dd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1549,6 +1549,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 |