Merge branch 'rr/rebase-stash-store'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:29:41 +0000 (14:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:29:41 +0000 (14:29 -0700)
Finishing touches for the "git rebase --autostash" feature
introduced earlier.

* rr/rebase-stash-store:
rebase: use 'git stash store' to simplify logic
stash: introduce 'git stash store'
stash: simplify option parser for create
stash doc: document short form -p in synopsis
stash doc: add a warning about using create

1  2 
git-rebase.sh
t/t3903-stash.sh
diff --cc git-rebase.sh
Simple merge
Simple merge