Philip Oakley fd0f8d83f8 rebase: help user when dying with preserve-merges` ...

Git will die if a "rebase --preserve-merges" is in progress.
Users cannot --quit, --abort or --continue the rebase.

This sceario can occur if the user updates their Git, or switches
to another newer version, after starting a preserve-merges rebase,
commonly via the pull setting.

One trigger is an unexpectedly difficult to resolve conflict, as
reported on the `git-users` group.
(https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM)

Tell the user the cause, i.e. the existence of the directory.
The problem must be resolved manually, `git rebase --<option>`
commands will die, or the user must downgrade. Also, note that
the deleted options are no longer shown in the documentation.

Signed-off-by: Philip Oakley <philipoakley@iee.email>

2022-04-18 08:29:52 -07:00

..

add.c

fscache: fscache takes an initial size

2022-04-18 08:29:47 -07:00

am.c

Merge branch 'ab/date-mode-release'

2022-02-25 15:47:36 -08:00

annotate.c

…

apply.c

…

archive.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

bisect--helper.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

blame.c

Merge branch 'ja/i18n-common-messages'

2022-02-25 15:47:35 -08:00

branch.c

Merge branch 'gc/branch-recurse-submodules'

2022-02-18 13:53:29 -08:00

bugreport.c

…

bundle.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

cat-file.c

Merge branch 'jc/cat-file-batch-default-format-optim'

2022-03-23 14:09:31 -07:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

checkout--worker.c

…

checkout-index.c

checkout-index: integrate with sparse index

2022-01-13 13:49:45 -08:00

checkout.c

fscache: fscache takes an initial size

2022-04-18 08:29:47 -07:00

clean.c

clean: make use of FSCache

2022-04-18 08:29:47 -07:00

clone.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

column.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

commit-graph.c

commit-graph: fix memory leak in misused string_list API

2022-03-04 13:24:18 -08:00

commit-tree.c

…

commit.c

Merge pull request #1354 from dscho/phase-out-show-ignored-directory-gracefully

2022-04-18 08:29:52 -07:00

config.c

Merge branch 'mf/fix-type-in-config-h'

2022-03-16 17:53:07 -07:00

count-objects.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

credential.c

…

describe.c

i18n: turn even more messages into "cannot be used together" ones

2022-01-05 13:31:00 -08:00

diff-files.c

…

diff-index.c

…

diff-tree.c

i18n: refactor "foo and bar are mutually exclusive"

2022-01-05 13:29:23 -08:00

diff.c

builtin/diff.c: fix "git-diff" usage string typo

2022-02-02 11:30:53 -08:00

difftool.c

Introduce helper to create symlinks that knows about index_state

2022-04-18 08:29:50 -07:00

env--helper.c

…

fast-export.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

fast-import.c

Merge branch 'ns/core-fsyncmethod'

2022-03-25 16:38:24 -07:00

fetch-pack.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

fetch.c

Merge branch 'rc/fetch-refetch'

2022-04-04 10:56:23 -07:00

fmt-merge-msg.c

merge: allow to pretend a merge is made into a different branch

2021-12-20 14:55:02 -08:00

for-each-ref.c

…

for-each-repo.c

…

fsck.c

…

fsmonitor--daemon.c

fsmonitor--daemon: stub in health thread

2022-04-18 08:29:43 -07:00

gc.c

git maintenance: avoid console window in scheduled tasks on Windows

2022-04-18 08:29:41 -07:00

get-tar-commit-id.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

grep.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

hash-object.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

help.c

Merge branch 'ab/help-fixes'

2022-03-09 13:38:24 -08:00

hook.c

git hook run: add an --ignore-missing flag

2022-01-07 15:19:34 -08:00

index-pack.c

Merge branch 'ns/core-fsyncmethod'

2022-03-25 16:38:24 -07:00

init-db.c

Introduce helper to create symlinks that knows about index_state

2022-04-18 08:29:50 -07:00

interpret-trailers.c

…

log.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

ls-files.c

ls-files: support --recurse-submodules --stage

2022-02-23 16:41:55 -08:00

ls-remote.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

ls-tree.c

Merge branch 'tl/ls-tree-oid-only'

2022-04-06 15:21:59 -07:00

mailinfo.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

mailsplit.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

merge-base.c

merge-base: free() allocated "struct commit **" list

2022-03-04 13:24:17 -08:00

merge-file.c

…

merge-index.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

merge-ours.c

…

merge-recursive.c

gettext API users: don't explicitly cast ngettext()'s "n"

2022-03-07 11:57:52 -08:00

merge-tree.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

merge.c

hooks: fix an obscure TOCTOU "did we just run a hook?" race

2022-03-07 13:00:53 -08:00

mktag.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

mktree.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

multi-pack-index.c

…

mv.c

…

name-rev.c

name-rev: use generation numbers if available

2022-03-13 18:39:29 +00:00

notes.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

pack-objects.c

Merge branch 'ds/partial-bundle-more'

2022-04-04 10:56:21 -07:00

pack-redundant.c

…

pack-refs.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

patch-id.c

patch-id: fix scan_hunk_header on diffs with 1 line of before/after

2022-02-02 11:24:23 -08:00

prune-packed.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

prune.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

pull.c

Merge branch 'ja/i18n-common-messages'

2022-02-25 15:47:35 -08:00

push.c

i18n: factorize "invalid value" messages

2022-02-04 13:58:28 -08:00

range-diff.c

…

read-tree.c

read-tree: make three-way merge sparse-aware

2022-03-01 12:36:01 -08:00

rebase.c

rebase: help user when dying with preserve-merges`

2022-04-18 08:29:52 -07:00

receive-pack.c

Merge branch 'ab/string-list-count-in-size-t'

2022-03-16 17:53:09 -07:00

reflog.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

remote-ext.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

remote-fd.c

…

remote.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

repack.c

repack: add config to skip updating server info

2022-03-14 22:25:13 +00:00

replace.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

rerere.c

…

reset.c

reset: reinstate support for the deprecated --stdin option

2022-04-18 08:29:51 -07:00

rev-list.c

Merge branch 'ds/partial-bundles'

2022-03-21 15:14:24 -07:00

rev-parse.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

revert.c

…

rm.c

Merge branch 'ja/i18n-similar-messages'

2022-01-10 11:52:56 -08:00

send-pack.c

i18n: factorize "invalid value" messages

2022-02-04 13:58:28 -08:00

shortlog.c

string-list API: change "nr" and "alloc" to "size_t"

2022-03-07 12:02:04 -08:00

show-branch.c

date API: create a date.h, split from cache.h

2022-02-16 09:40:00 -08:00

show-index.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

show-ref.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

sparse-checkout.c

Merge branch 'ep/remove-duplicated-includes'

2022-03-23 14:09:30 -07:00

stash.c

Merge branch 'vd/stash-silence-reset'

2022-03-30 18:01:10 -07:00

stripspace.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

submodule--helper.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

symbolic-ref.c

…

tag.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

unpack-file.c

…

unpack-objects.c

unpack-objects: use the bulk-checkin infrastructure

2022-04-18 08:29:43 -07:00

update-index.c

Merge branch 'ns-batch-fsync' into HEAD

2022-04-18 08:29:46 -07:00

update-ref.c

…

update-server-info.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

upload-archive.c

mingw: ensure that core.longPaths is handled *always*

2022-04-18 08:29:49 -07:00

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'pw/worktree-list-with-z'

2022-04-04 10:56:25 -07:00

write-tree.c

…