From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 18:01:19 +0000 (-0700)
Subject: Merge branch 'gp/status-rebase-i-info'
X-Git-Tag: v2.6.0-rc0~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=178d2c7a7fdf0af639078963acfa6d56bad278ca;p=thirdparty%2Fgit.git

Merge branch 'gp/status-rebase-i-info'

Teach "git status" to show a more detailed information regarding
the "rebase -i" session in progress.

* gp/status-rebase-i-info:
  status: add new tests for status during rebase -i
  status: give more information during rebase -i
  status: differentiate interactive from non-interactive rebases
  status: factor two rebase-related messages together
---

178d2c7a7fdf0af639078963acfa6d56bad278ca