Andrew's git / gitweb.git / diff
?
Merge branch 'dm/stash-k-i-p' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:49 +0000 (14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:49 +0000 (14:57 -0700)
* dm/stash-k-i-p:
stash: ensure --no-keep-index and --patch can be used in any order
stash: add two more tests for --no-keep-index

1  2 
git-stash.sh patch | diff1 | diff2 | blob | history
t/t3903-stash.sh patch | diff1 | diff2 | blob | history
diff --cc git-stash.sh
Simple merge
diff --cc t/t3903-stash.sh
Simple merge