diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:16 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:16 +0900 |
commit | 57b530125e022de79f5f0b208bc0a5ee67c18b77 (patch) | |
tree | b6eaafd7b203b0886aa44d3a299823cbd2eeb933 /bisect.c | |
parent | Merge branch 'pb/pretty-email-without-domain-part' (diff) | |
parent | stash: handle staged changes in skip-worktree files correctly (diff) | |
download | tgif-57b530125e022de79f5f0b208bc0a5ee67c18b77.tar.xz |
Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
"git stash save" in a working tree that is sparsely checked out
mistakenly removed paths that are outside the area of interest.
* js/update-index-ignore-removal-for-skip-worktree:
stash: handle staged changes in skip-worktree files correctly
update-index: optionally leave skip-worktree entries alone
Diffstat (limited to 'bisect.c')
0 files changed, 0 insertions, 0 deletions