projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91feb38 743bf6d)
Merge branch 'ph/stash-rerere' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:12 +0000 (11:10 -0700)
committerJunio 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

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

diff --cc git-stash.sh
Simple merge
Git—the stupid content tracker