From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Jun 2013 21:51:58 +0000 (-0700)
Subject: Merge branch 'jg/status-config'
X-Git-Tag: v1.8.4-rc0~151
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1a22bd31f0a5130ce6c934951a5526ceb774c2be

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: introduce status.branch to enable --branch by default
status: introduce status.short to enable --short by default
---

1a22bd31f0a5130ce6c934951a5526ceb774c2be