diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-01-28 16:45:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-28 16:45:52 -0800 |
| commit | f120b65cd41c0e93432af1a36c82fd3a8d39ccd4 (patch) | |
| tree | 0657b197543b8eedd733aac032e9587c25d0a614 /xdiff/xpatience.c | |
| parent | Git 2.35 (diff) | |
| parent | sequencer, stash: fix running from worktree subdir (diff) | |
| download | tgif-f120b65cd41c0e93432af1a36c82fd3a8d39ccd4.tar.xz | |
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
Diffstat (limited to 'xdiff/xpatience.c')
0 files changed, 0 insertions, 0 deletions