Skip to content

Commit da9963d

Browse files
committed
Be verbose about stashes
1 parent 8ebaee4 commit da9963d

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

msfupdate

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ if is_git
119119
$stderr.puts "[-] /usr/local/bin instead of running this file directly (e.g.: ./msfupdate)"
120120
$stderr.puts "[-] to ensure a proper environment."
121121
exit 1
122+
else
123+
$stdout.puts "[*] Stashed local changes (if any) to avoid merge conflicts."
124+
$stdout.puts "[*] Run 'git stash pop' to reapply local changes."
122125
end
123126

124127
system("git", "reset", "HEAD", "--hard")

0 commit comments

Comments
 (0)