Junio C Hamano f120b65cd4 Merge branch 'en/keep-cwd' into maint ...

Fix a regression in 2.35 that roke the use of "rebase" and "stash"
in a secondary worktree.

* en/keep-cwd:
  sequencer, stash: fix running from worktree subdir

2022-01-28 16:45:52 -08:00

..

add.c

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

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

am.c

Merge branch 'ja/i18n-similar-messages'

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

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'ld/sparse-diff-blame'

2021-12-21 15:03:17 -08:00

branch.c

Merge branch 'js/branch-track-inherit'

2022-01-20 15:25:38 -08:00

bugreport.c

…

bundle.c

…

cat-file.c

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

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

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout--worker.c

…

checkout-index.c

…

checkout.c

Merge branch 'ab/checkout-branch-info-leakfix'

2022-01-24 09:14:46 -08:00

clean.c

…

clone.c

Merge branch 'ps/lockfile-cleanup-fix'

2022-01-12 15:11:43 -08:00

column.c

…

commit-graph.c

…

commit-tree.c

…

commit.c

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

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

config.c

…

count-objects.c

…

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

…

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

…

difftool.c

i18n: turn "options are incompatible" into "cannot be used together"

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

env--helper.c

…

fast-export.c

Merge branch 'ja/i18n-similar-messages'

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

fast-import.c

…

fetch-pack.c

…

fetch.c

Merge branch 'ps/lockfile-cleanup-fix'

2022-01-12 15:11:43 -08: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

…

gc.c

…

get-tar-commit-id.c

…

grep.c

…

hash-object.c

…

help.c

…

index-pack.c

i18n: factorize "--foo requires --bar" and the like

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

init-db.c

i18n: refactor "foo and bar are mutually exclusive"

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

interpret-trailers.c

…

log.c

Merge branch 'ja/i18n-similar-messages'

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

ls-files.c

Merge branch 'ja/i18n-similar-messages'

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

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'ja/i18n-similar-messages'

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

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'ab/usage-die-message'

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

pack-objects.c

i18n: turn "options are incompatible" into "cannot be used together"

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

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

Merge branch 'ns/tmp-objdir'

2022-01-03 16:24:15 -08:00

pull.c

fetch/pull: use the sparse index

2021-12-22 11:42:39 -08:00

push.c

i18n: turn "options are incompatible" into "cannot be used together"

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

range-diff.c

…

read-tree.c

…

rebase.c

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

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

receive-pack.c

Merge branch 'ns/tmp-objdir'

2022-01-03 16:24:15 -08:00

reflog.c

reflog + refs-backend: move "verbose" out of the backend

2021-12-22 16:24:14 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

Merge branch 'ja/i18n-similar-messages'

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

replace.c

…

rerere.c

…

reset.c

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

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

rev-list.c

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

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

rev-parse.c

…

revert.c

…

rm.c

Merge branch 'ja/i18n-similar-messages'

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

send-pack.c

…

shortlog.c

…

show-branch.c

i18n: turn "options are incompatible" into "cannot be used together"

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

show-index.c

…

show-ref.c

…

sparse-checkout.c

Merge branch 'ds/sparse-checkout-malformed-pattern-fix'

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

stash.c

Merge branch 'en/keep-cwd' into maint

2022-01-28 16:45:52 -08:00

stripspace.c

…

submodule--helper.c

i18n: refactor "foo and bar are mutually exclusive"

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

symbolic-ref.c

…

tag.c

i18n: tag.c factorize i18n strings

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

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

i18n: factorize "--foo requires --bar" and the like

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

write-tree.c

…