diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
commit | 92d80370646a0ce43b0c769027492b3c891090aa (patch) | |
tree | cee7315334fee3145cb4badcc7a400e3e763fbac /git-rebase.txt | |
parent | 48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff) | |
download | git-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz |
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-rebase.txt')
-rw-r--r-- | git-rebase.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 0387b40e0..de222c81a 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -208,10 +208,10 @@ rebase.stat:: rebase. False by default. rebase.autoSquash:: - If set to true enable '--autosquash' option by default. + If set to true enable `--autosquash` option by default. rebase.autoStash:: - If set to true enable '--autostash' option by default. + If set to true enable `--autostash` option by default. rebase.missingCommitsCheck:: If set to "warn", print warnings about removed commits in @@ -220,7 +220,7 @@ rebase.missingCommitsCheck:: done. "ignore" by default. rebase.instructionFormat:: - Custom commit list format to use during an '--interactive' rebase. + Custom commit list format to use during an `--interactive` rebase. OPTIONS ------- @@ -428,9 +428,9 @@ without an explicit `--interactive`. "fixup! " or "squash! " after the first, in case you referred to an earlier fixup/squash with `git commit --fixup/--squash`. + -This option is only valid when the '--interactive' option is used. +This option is only valid when the `--interactive` option is used. + -If the '--autosquash' option is enabled by default using the +If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting. |