summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-11 13:05:52 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-11 13:05:52 -0700
commitd26792ad69c0d2ea0b197656ae9a562e2c1f900e (patch)
tree06b8527f68bc9705bc6fe979f9c3f75ab2bb5e05 /git-rebase--interactive.sh
parent77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb (diff)
parenta73653130edd6a8977106d45a8092c09040f9132 (diff)
downloadgit-d26792ad69c0d2ea0b197656ae9a562e2c1f900e.tar.gz
Merge branch 'pb/stash-refuse-to-kill'
"git stash save" is not just about "saving" the local changes, but also is to restore the working tree state to that of HEAD. If you changed a non-directory into a directory in the local change, you may have untracked files in that directory, which have to be killed while doing so, unless you run it with --include-untracked. Teach the command to detect and error out before spreading the damage. This needed a small fix to "ls-files --killed". * pb/stash-refuse-to-kill: git stash: avoid data loss when "git stash save" kills a directory treat_directory(): do not declare submodules to be untracked
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions