]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 786a89d 43dee07)
Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:21:45 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:21:45 +0000 (12:21 -0700)
commit9ce7100b1c1aa3a1523057c904f081abcf87ed60
tree6b8c27d54489e5bed75ed415ba6f32b7a05cfe86tree | snapshot
parent786a89d3477c339676ed36d5d2d7507251344952commit | diff
parent43dee070eb8faa400f24a9fee08e64d2d18224c2commit | diff
Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'

* 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.