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/config | |
| 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/config')
| -rw-r--r-- | Documentation/config/rebase.txt | 3 |
1 files changed, 3 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 |