diff options
author | Derrick Stolee <derrickstolee@github.com> | 2022-07-19 21:33:42 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-07-19 22:49:04 +0300 |
commit | 3113fedaeb67eed4c46ef7bdd670b8406317a303 (patch) | |
tree | 8bc5de79a9222aa73d7a9f40f3878e17afe8c42a /Documentation | |
parent | b3b1a21d1a5df87e81fa8b53c6c3cf9760ca12d4 (diff) |
rebase: add rebase.updateRefs config option
The previous change added the --update-refs command-line option. For
users who always want this mode, create the rebase.updateRefs config
option which behaves the same way as rebase.autoSquash does with the
--autosquash option.
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/config/rebase.txt | 3 | ||||
-rw-r--r-- | Documentation/git-rebase.txt | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index 8c979cb20f..f19bd0e040 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -21,6 +21,9 @@ rebase.autoStash:: `--autostash` options of linkgit:git-rebase[1]. Defaults to false. +rebase.updateRefs:: + If set to true enable `--update-refs` option by default. + rebase.missingCommitsCheck:: If set to "warn", git rebase -i will print a warning if some commits are removed (e.g. a line was deleted), however the diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index dfd847d661..305255f1e1 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -614,6 +614,9 @@ start would be overridden by the presence of Automatically force-update any branches that point to commits that are being rebased. Any branches that are checked out in a worktree are not updated in this way. ++ +If the configuration variable `rebase.updateRefs` is set, then this option +can be used to override and disable this setting. INCOMPATIBLE OPTIONS -------------------- |