From: Junio C Hamano <junkio@cox.net>
Date: Mon, 23 Oct 2006 05:40:30 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~78
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02a20456d2c5efccbdd0093ad2a16134f160c218;p=git.git

Merge branch 'maint'

* maint:
  pager: default to LESS=FRSX not LESS=FRS
  Make prune also run prune-packed
  git-vc: better installation instructions
  gitweb: Do not esc_html $basedir argument to git_print_tree_entry
  gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
  Fix usagestring for git-branch
  git-merge: show usage if run without arguments
---

02a20456d2c5efccbdd0093ad2a16134f160c218