From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2013 20:05:34 +0000 (-0700)
Subject: Merge branch 'jg/status-config'
X-Git-Tag: v1.8.4-rc0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e29497d28ce1ec9f76493542fcab4a8d61ca5fce;p=thirdparty%2Fgit.git

Merge branch 'jg/status-config'

"git status" learned status.branch and status.short configuration
variables to use --branch and --short options by default (override
with --no-branch and --no-short options from the command line).

* jg/status-config:
  status/commit: make sure --porcelain is not affected by user-facing config
  commit: make it work with status.short
  status: introduce status.branch to enable --branch by default
  status: introduce status.short to enable --short by default
---

e29497d28ce1ec9f76493542fcab4a8d61ca5fce