| commit | ef92392b6c8596b61eab6f2045a54c086f340cf7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Sep 2012 18:10:12 +0000 (11 11:10 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Sep 2012 18:10:12 +0000 (11 11:10 -0700) | ||
| tree | 961a30992de888f4fd135507cb33ebf1f6bfcf56 | treesnapshot (tar.gz zip) |
| parent | 91feb387f2cba906a233c3683cfa5ff2bc32d79a | commitdiff |
| parent | 743bf6d8b07f0c5717bf5c37b8b50ae9de619c83 | commitdiff |
Merge branch 'ph/stash-rerere' into maint-1.7.11
* ph/stash-rerere:
stash: invoke rerere in case of conflict
test: git-stash conflict sets up rerere
* ph/stash-rerere:
stash: invoke rerere in case of conflict
test: git-stash conflict sets up rerere
| git-stash.sh | diff1 | diff2 | blobhistory |