My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a01752 2d4c993)
Merge branch 'jc/stash-pop-not-popped' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700)
* jc/stash-pop-not-popped:
  stash pop: mention we did not drop the stash upon failing to apply

1  2 
git-stash.sh patch | diff1 | diff2 | blob | history

diff --cc git-stash.sh
Simple merge
The core git plumbing