Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ph/stash-rerere' into maint-1.7.11
author
Junio C Hamano
<gitster@pobox.com>
Tue, 11 Sep 2012 18:10:12 +0000
(11:10 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 11 Sep 2012 18:10:12 +0000
(11:10 -0700)
* ph/stash-rerere:
stash: invoke rerere in case of conflict
test: git-stash conflict sets up rerere
raw
(from:
ef92392
)
No differences found