projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5428530 43dee07)
Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:51:45 +0000 (12:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:51:45 +0000 (12:51 -0700)
commit29734cc296410f361e5abce79306986eeb4e5341
tree59244ccc2389bab5c9aed81e15611a3d6847709atree | snapshot
parent5428530a0b651ff8f5b20fb6e7c7536da3613d3ecommit | diff
parent43dee070eb8faa400f24a9fee08e64d2d18224c2commit | diff
Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff' into next

* fr/sequencer-fail-with-not-one-upon-no-ff:
  sequencer: signal failed ff as an aborted, not a conflicted merge
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.