From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 May 2016 21:54:28 +0000 (-0700)
Subject: Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
X-Git-Tag: v2.9.0-rc0~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ce2824e4ba56bf0f2017a0e351fa35c22a705ac

Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'

"git commit --dry-run" reported "No, no, you cannot commit." in one
case where "git commit" would have allowed you to commit, and this
improves it a little bit ("git commit --dry-run --short" still does
not give you the correct answer, for example).  This is a stop-gap
measure in that "commit --short --dry-run" still gives an incorrect
result.

* ss/commit-dry-run-resolve-merge-to-no-op:
wt-status.c: set commitable bit if there is a meaningful merge.
---

9ce2824e4ba56bf0f2017a0e351fa35c22a705ac