From: Junio C Hamano <junkio@cox.net>
Date: Tue, 24 Oct 2006 03:53:38 +0000 (-0700)
Subject: Merge branch 'master' into jc/web
X-Git-Tag: v1.4.4-rc1~67^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ccbb3d17ace70be9d986368d3df795f5961e9683?hp=ccbb3d17ace70be9d986368d3df795f5961e9683

Merge branch 'master' into jc/web

* master: (114 commits)
gitweb: Fix setting $/ in parse_commit()
daemon: do not die on older clients.
xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
git-clone: honor --quiet
Documentation for the [remote] config
prune-packed: Fix uninitialized variable.
ignore-errors requires cl
git-send-email: do not pass custom Date: header
Use column indexes in git-cvsserver where necessary.
gitweb: Add '..' (up directory) to tree view if applicable
gitweb: Improve git_print_page_path
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
add the capability for index-pack to read from a stream
git-clone: define die() and use it.
...
---