From: Jeff King <peff@peff.net>
Date: Mon, 29 Oct 2012 08:14:57 +0000 (-0400)
Subject: Merge branch 'nd/status-long'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eeb2535f5a517fc0b5e302cab0a70cc82375b836;p=git.git

Merge branch 'nd/status-long'

Allow an earlier "--short" option on the command line to be
countermanded with the "--long" option for "git status" and "git
commit".

* nd/status-long:
  status: add --long output format option
---

eeb2535f5a517fc0b5e302cab0a70cc82375b836