diff options
| author | Philip Oakley <philipoakley@iee.email> | 2022-06-04 11:17:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-06 10:45:54 -0700 |
| commit | afea77a72a2e986dfa285b86c08ba51772579dad (patch) | |
| tree | b274bc7df610b311e50026f74d3fc9f0428c40bd /commit.c | |
| parent | afd58a0d42b5385089799fdd66b555df7cc8a4b4 (diff) | |
| download | git-afea77a72a2e986dfa285b86c08ba51772579dad.tar.gz | |
rebase: note `preserve` merges may be a pull config option
The `--preserve-merges` option was removed by v2.34.0. However
users may not be aware that it is also a Pull configuration option,
which is still offered by major IDE vendors such as Visual Studio.
Extend the `--preserve-merges` die message to also direct users to
the possible use of the `preserve` option in the `pull.rebase` config.
This is an additional 'belt and braces' information statement.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions