summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-28 17:06:57 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-28 17:06:57 -0800
commitd25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (patch)
tree88de4825ce11d7eaed4719b0b9db1d0e649f9107 /git-stash.sh
parentb3a4f8586b4ffa6c896cf0afb2ea49d64faf81ad (diff)
parent38762c47d6442dc0ce0f45533f9151877c485337 (diff)
downloadgit-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.gz
Merge branch 'maint'
* maint: scripts: do not get confused with HEAD in work tree Improve description of git-branch -d and -D in man page.
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh
index dd155568d9..b1529e28b1 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -15,7 +15,7 @@ trap 'rm -f "$TMP-*"' 0
ref_stash=refs/stash
no_changes () {
- git diff-index --quiet --cached HEAD &&
+ git diff-index --quiet --cached HEAD -- &&
git diff-files --quiet
}