Merge branch 'nd/status-long'
commiteeb2535f5a517fc0b5e302cab0a70cc82375b836
authorJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:14:57 +0000 (29 04:14 -0400)
committerJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:14:58 +0000 (29 04:14 -0400)
tree360c430d64dea4f58612b65a15575a535d510861
parentdeb2458132a5886c8f7b12870451a1bc3c311e9f
parentf3f47a1e8ddbecb0865be3d4c5dfef609cb58867
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