diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-01 09:58:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-01 09:58:38 -0700 |
| commit | 3d8e3dc4fc22fe41f8ee1184f085c600f35ec76f (patch) | |
| tree | 70e19f5b6c2b3a7a9bd584cc5303813c3725aa4b /Documentation/git-rebase.txt | |
| parent | e59acea3f0752ddfdcaab08b54dc0f84c7ab66e6 (diff) | |
| parent | 4611884ea883908a9638cafbd824c401c41cf7f6 (diff) | |
| download | git-3d8e3dc4fc22fe41f8ee1184f085c600f35ec76f.tar.gz | |
Merge branch 'ds/rebase-update-ref'
"git rebase -i" learns to update branches whose tip appear in the
rebased range with "--update-refs" option.
source: <pull.1247.v5.git.1658255624.gitgitgadget@gmail.com>
* ds/rebase-update-ref:
sequencer: notify user of --update-refs activity
sequencer: ignore HEAD ref under --update-refs
rebase: add rebase.updateRefs config option
sequencer: rewrite update-refs as user edits todo list
rebase: update refs from 'update-ref' commands
rebase: add --update-refs option
sequencer: add update-ref command
sequencer: define array with enum values
rebase-interactive: update 'merge' description
branch: consider refs under 'update-refs'
t2407: test branches currently using apply backend
t2407: test bisect and rebase as black-boxes
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index a872ab0fbd..080658c871 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -612,6 +612,15 @@ provided. Otherwise an explicit `--no-reschedule-failed-exec` at the start would be overridden by the presence of `rebase.rescheduleFailedExec=true` configuration. +--update-refs:: +--no-update-refs:: + 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 -------------------- @@ -635,6 +644,7 @@ are incompatible with the following options: * --empty= * --reapply-cherry-picks * --edit-todo + * --update-refs * --root when used in combination with --onto In addition, the following pairs of options are incompatible: |