From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 16 Oct 2007 02:31:47 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~360
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d55e7c3acf72413563e695a19f7f66efac442064?ds=inline;hp=d55e7c3acf72413563e695a19f7f66efac442064

Merge branch 'maint'

* maint:
Whip post 1.5.3.4 maintenance series into shape.
rebase -i: use diff plumbing instead of porcelain
Do not remove distributed configure script
git-archive: document --exec
git-reflog: document --verbose
git-config: handle --file option with relative pathname properly
clear_commit_marks(): avoid deep recursion
git add -i: Remove unused variables
git add -i: Fix parsing of abbreviated hunk headers
git-config: don't silently ignore options after --list
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
Fix embarrassing "git log --follow" bug

Conflicts:

RelNotes
git-rebase--interactive.sh
---