projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 19801d6 743bf6d)
Merge branch 'ph/stash-rerere'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 22:54:12 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 22:54:12 +0000 (15:54 -0700)
commit799beac15391004778186503bf198783960a82a3
tree5afcd08f04bf24fca4db44bdfbff4f9e2182abb0tree | snapshot
parent19801d6a2768b9ce056da4635a287885d08940cbcommit | diff
parent743bf6d8b07f0c5717bf5c37b8b50ae9de619c83commit | diff
Merge branch 'ph/stash-rerere'

"git stash" internally used "git merge-recursive" backend, which did
not trigger "rerere" upon conflicts unlike other mergy operations.

* ph/stash-rerere:
  stash: invoke rerere in case of conflict
  test: git-stash conflict sets up rerere
git-stash.sh diff1 | diff2 | blob | history
Git—the stupid content tracker