]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/keep-cwd' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 29 Jan 2022 00:45:39 +0000 (16:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 29 Jan 2022 00:45:52 +0000 (16:45 -0800)
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

1  2 
builtin/stash.c
sequencer.c

diff --cc builtin/stash.c
Simple merge
diff --cc sequencer.c
Simple merge