]> git.99rst.org Git - git.git/commitdiff
git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89bece5 ff5b791)
Merge branch 'en/keep-cwd' into maint
authorJunio C Hamano <redacted>
Sat, 29 Jan 2022 00:45:39 +0000 (16:45 -0800)
committerJunio C Hamano <redacted>
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 patch | diff1 | diff2 | blob | history
sequencer.c patch | diff1 | diff2 | blob | history

diff --cc builtin/stash.c
Simple merge
diff --cc sequencer.c
Simple merge
git clone https://git.99rst.org/PROJECT