diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 15:23:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 15:23:52 -0700 |
| commit | f1f5a7b64053a592c7655df84079443328582b68 (patch) | |
| tree | 9f7d07ba52ea6281993ea65e4805aeb31d2f080b /config.txt | |
| parent | 8d74cd3acd56a5e53475ddc934fdf2e135a634e8 (diff) | |
| download | git-htmldocs-f1f5a7b64053a592c7655df84079443328582b68.tar.gz | |
Autogenerated HTML docs for v1.8.3.1-377-g4d1c5
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config.txt b/config.txt index 6e53fc507..7fd4035cb 100644 --- a/config.txt +++ b/config.txt @@ -1867,6 +1867,14 @@ rebase.stat:: rebase.autosquash:: If set to true enable '--autosquash' option by default. +rebase.autostash:: + When set to true, automatically create a temporary stash + before the operation begins, and apply it after the operation + ends. This means that you can run rebase on a dirty worktree. + However, use with care: the final stash application after a + successful rebase might result in non-trivial conflicts. + Defaults to false. + receive.autogc:: By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop |