summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorしらいしななこ <nanako3@bluebottle.com>2007-06-30 05:37:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-01 03:50:51 (GMT)
commitf2c66ed196d1d1410d014e4ee3e2b585936101f5 (patch)
tree61446b2109cfb4b832c4e8d9be3ad98cb6e1f753 /Makefile
parent06f59e9f5daa06fc4bd51cf4c508b3edd3ed514a (diff)
downloadgit-f2c66ed196d1d1410d014e4ee3e2b585936101f5.zip
git-f2c66ed196d1d1410d014e4ee3e2b585936101f5.tar.gz
git-f2c66ed196d1d1410d014e4ee3e2b585936101f5.tar.bz2
Add git-stash script
When my boss has something to show me and I have to update, for some reason I am always in the middle of doing something else, and git pull command refuses to work in such a case. I wrote this little script to save the changes I made, perform the update, and then come back to where I was, but on top of the updated commit. This is how you would use the script: $ git stash $ git pull $ git stash apply [jc: with a few fixlets from the list] Signed-off-by: Nanako Shiraishi <nanako3@bluebottle.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5d60dc8..b3b66b7 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \