diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:45:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:45:57 -0700 |
commit | 7425dcc95e11c20dc4663d7a376dc9ba0424d843 (patch) | |
tree | 91068e5a244976b0d2d12516f4c1814d8338bccc /Makefile | |
parent | f36db549057f09dd390d712fa2d72dd2599feba6 (diff) | |
parent | 9a5391cf1836fa1b66f3c89ce9b38f8249bb0521 (diff) | |
download | git-7425dcc95e11c20dc4663d7a376dc9ba0424d843.tar.gz |
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
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -212,7 +212,8 @@ SCRIPT_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 \ |