Be verbose about stashes

2012-11-05 14:52:14 -06:00 · 2012-11-05 14:52:14 -06:00 · da9963d3d9
parent 8ebaee4b7c
commit da9963d3d9
1 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@ -119,6 +119,9 @@ if is_git
 		$stderr.puts "[-] /usr/local/bin instead of running this file directly (e.g.: ./msfupdate)"
 		$stderr.puts "[-] to ensure a proper environment."
 		exit 1
+	else
+		$stdout.puts "[*] Stashed local changes (if any) to avoid merge conflicts."
+		$stdout.puts "[*] Run 'git stash pop' to reapply local changes."
 	end

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