Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Aug 2009 22:20:28 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Aug 2009 22:20:28 +0000 (15:20 -0700)
commit367ea191e659da05a2e79a7025d8628a02f8268a
tree0273a3decb6efe958e9c665208f1f2236d0cc8c4
parentdda1f2a5c3aca5072aada32eef159067ba16f0e9
parentea41cfc4f54f884582dbda307287f12bb1fc15e9
Merge branch 'js/stash-dwim' into tr/reset-checkout-patch

* commit 'tr/reset-checkout-patch^^2':
  Make 'git stash -k' a short form for 'git stash save --keep-index'
Documentation/git-stash.txt
git-stash.sh