summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorしらいしななこ <nanako3@bluebottle.com>2007-06-30 14:37:09 +0900
committerJunio C Hamano <gitster@pobox.com>2007-06-30 20:50:51 -0700
commitf2c66ed196d1d1410d014e4ee3e2b585936101f5 (patch)
tree61446b2109cfb4b832c4e8d9be3ad98cb6e1f753 /.gitignore
parent06f59e9f5daa06fc4bd51cf4c508b3edd3ed514a (diff)
downloadgit-f2c66ed196d1d1410d014e4ee3e2b585936101f5.tar.gz
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 '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e8b060cbe4..02d9b04da0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,6 +123,7 @@ git-ssh-fetch
git-ssh-pull
git-ssh-push
git-ssh-upload
+git-stash
git-status
git-stripspace
git-submodule