summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-11-10 18:02:16 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-11-10 18:02:16 +0900
commit57b530125e022de79f5f0b208bc0a5ee67c18b77 (patch)
treeb6eaafd7b203b0886aa44d3a299823cbd2eeb933 /contrib/fast-import
parentMerge branch 'pb/pretty-email-without-domain-part' (diff)
parentstash: handle staged changes in skip-worktree files correctly (diff)
downloadtgif-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 'contrib/fast-import')
0 files changed, 0 insertions, 0 deletions