From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 19:41:15 +0000 (-0700)
Subject: Merge branch 'jn/debian-customizes-default-editor'
X-Git-Tag: v1.7.11-rc0~128
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2347982d1ad1a29fa93cd95eb51e5c74c689177e;p=git.git

Merge branch 'jn/debian-customizes-default-editor'

Make it easier for distros to document custom pager and editor they
used when building their binary releases in "git var" documentation.

By Jonathan Nieder
* jn/debian-customizes-default-editor:
  var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
  var doc: default editor and pager are configurable at build time
---

2347982d1ad1a29fa93cd95eb51e5c74c689177e