From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Jul 2007 08:45:57 +0000 (-0700)
Subject: Merge branch 'ns/stash'
X-Git-Tag: v1.5.3-rc0~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7425dcc95e11c20dc4663d7a376dc9ba0424d843?ds=inline;hp=-c

Merge branch 'ns/stash'

* ns/stash:
Documentation: quote {non-attributes} for asciidoc
git-stash: don't complain when listing in a repo with no stash
git-stash: fix "can't shift that many" with no arguments
git-stash: fix "no arguments" case in documentation
git-stash: require "save" to be explicit and update documentation
Document git-stash
Add git-stash script
---

7425dcc95e11c20dc4663d7a376dc9ba0424d843
diff --combined .gitignore
index a2a617dc62,02d9b04da0..20ee642420
--- a/.gitignore
+++ b/.gitignore
@@@ -96,7 -96,6 +96,7 @@@ git-pus
  git-quiltimport
  git-read-tree
  git-rebase
 +git-rebase--interactive
  git-receive-pack
  git-reflog
  git-relink
@@@ -124,6 -123,7 +124,7 @@@ git-ssh-fetc
  git-ssh-pull
  git-ssh-push
  git-ssh-upload
+ git-stash
  git-status
  git-stripspace
  git-submodule
diff --combined Makefile
index eed6bd5770,b3b66b7991..90597edfc7
--- a/Makefile
+++ b/Makefile
@@@ -204,7 -204,7 +204,7 @@@ SCRIPT_SH = 
  	git-fetch.sh \
  	git-ls-remote.sh \
  	git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
 -	git-pull.sh git-rebase.sh \
 +	git-pull.sh git-rebase.sh git-rebase--interactive.sh \
  	git-repack.sh git-request-pull.sh git-reset.sh \
  	git-sh-setup.sh \
  	git-tag.sh git-verify-tag.sh \
@@@ -212,7 -212,8 +212,8 @@@
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
  	git-merge-resolve.sh git-merge-ours.sh \
  	git-lost-found.sh git-quiltimport.sh git-submodule.sh \
- 	git-filter-branch.sh
+ 	git-filter-branch.sh \
+ 	git-stash.sh
  
  SCRIPT_PERL = \
  	git-add--interactive.perl \