Merge branch 'ns/stash'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:45:57 +0000 (01:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:45:57 +0000 (01:45 -0700)
* 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

1  2 
.gitignore
Makefile
diff --combined .gitignore
index a2a617dc62f9d9106d91718b0fa6f4f92ab6b4d9,02d9b04da0a493fd6d28156fadc1a1f188ac2b0f..20ee642420a82d71a5ed7df6194de87f436bc6de
@@@ -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 eed6bd57703e5634642769cad755511b549b8cc7,b3b66b79914170cdce1ccd5f5617b6d0408d6981..90597edfc71d40985068267b7dec2bd174990641
+++ 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 \
        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 \