]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4c5d9f dfd557c)
Merge branch 'js/stash-apply-in-secondary-worktree'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Oct 2019 05:24:48 +0000 (14:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Oct 2019 05:24:48 +0000 (14:24 +0900)
"git stash apply" in a subdirectory of a secondary worktree failed
to access the worktree correctly, which has been corrected.

* js/stash-apply-in-secondary-worktree:
  stash apply: report status correctly even in a worktree's subdirectory

1  2 
builtin/stash.c patch | diff1 | diff2 | blob | history

diff --cc builtin/stash.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.