git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12deaf6 5fdacc1)
Merge branch 'wd/rebase-conflict-guide'
authorJunio C Hamano <redacted>
Fri, 11 Aug 2017 20:26:58 +0000 (13:26 -0700)
committerJunio C Hamano <redacted>
Fri, 11 Aug 2017 20:26:58 +0000 (13:26 -0700)
The advice message given when "git rebase" stops for conflicting
changes has been improved.

* wd/rebase-conflict-guide:
  rebase: make resolve message clearer for inexperienced users


Trivial merge
git clone https://git.99rst.org/PROJECT