From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Feb 2007 09:20:42 +0000 (-0800)
Subject: Merge branch 'master' into js/diff-ni
X-Git-Tag: v1.5.1-rc1~121^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=048f48a2fdefdf71e7af19ec7111000ce2ebf52e;p=git.git

Merge branch 'master' into js/diff-ni

* master: (201 commits)
  Documentation: link in 1.5.0.2 material to the top documentation page.
  Documentation: document remote.<name>.tagopt
  GIT 1.5.0.2
  git-remote: support remotes with a dot in the name
  Documentation: describe "-f/-t/-m" options to "git-remote add"
  diff --cc: fix display of symlink conflicts during a merge.
  merge-recursive: fix longstanding bug in merging symlinks
  merge-index: fix longstanding bug in merging symlinks
  diff --cached: give more sensible error message when HEAD is yet to be created.
  Update tests to use test-chmtime
  Add test-chmtime: a utility to change mtime on files
  Add Release Notes to prepare for 1.5.0.2
  Allow arbitrary number of arguments to git-pack-objects
  rerere: do not deal with symlinks.
  rerere: do not skip two conflicted paths next to each other.
  Don't modify CREDITS-FILE if it hasn't changed.
  diff-patch: Avoid emitting double-slashes in textual patch.
  Reword git-am 3-way fallback failure message.
  Limit filename for format-patch
  core.legacyheaders: Use the description used in RelNotes-1.5.0
  ...
---

048f48a2fdefdf71e7af19ec7111000ce2ebf52e