From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Mar 2010 00:01:55 +0000 (-0700)
Subject: Sync with Git 1.7.0.3
X-Git-Tag: v1.7.1-rc0~48
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4503bd5c3732b142667e14d214c21c46e8f3eeaa?ds=inline;hp=-c

Sync with Git 1.7.0.3

* maint:
Git 1.7.0.3
.mailmap: Map the the first submissions of MJG by e-mail
Documentation/git-clone: Transform description list into item list
Documentation/urls: Remove spurious example markers
Documentation/gitdiffcore: Remove misleading date in heading
Documentation/git-reflog: Fix formatting of command lists
---

4503bd5c3732b142667e14d214c21c46e8f3eeaa
diff --combined Documentation/RelNotes-1.7.1.txt
index 06cefaf01b,0000000000..750d40f34a
mode 100644,000000..100644
--- a/Documentation/RelNotes-1.7.1.txt
+++ b/Documentation/RelNotes-1.7.1.txt
@@@ -1,70 -1,0 +1,70 @@@
 +Git v1.7.1 Release Notes (draft)
 +================================
 +
 +Updates since v1.7.0
 +--------------------
 +
 + * Some commands (e.g. svn and http interfaces) that interactively ask
 +   password can be told to use an external program given via GIT_ASKPASS.
 +
 + * Color values given to "color.<cmd>.<slot>" configuration can now have
 +   more than one attributes (e.g. "bold ul").
 +
 + * "git apply --whitespace=fix" didn't work well when an early patch in
 +   a patch series adds trailing blank lines and a later one depended on
 +   such a block of blank lines at the end.
 +
 + * "git am" learned "--keep-cr" option to handle inputs that are
 +   mixture of changes to files with and without CRLF line endings.
 +
 + * "git cvsimport" learned -R option to leave revision mapping between
 +   CVS revisions and resulting git commits.
 +
 + * "git for-each-ref" learned %(symref), %(symref:short) and %(flag)
 +   tokens.
 +
 + * "git hash-object --stdin-paths" can take "--no-filters" option now.
 +
 + * "git init" can be told to look at init.templatedir configuration
 +   variable (obviously that has to come from either /etc/gitconfig or
 +   $HOME/.gitconfig).
 +
 + * "git grep" learned "--no-index" option, to search inside contents that
 +   are not managed by git.
 +
 + * "git grep" learned --color=auto/always/never.
 +
 + * "git grep" learned to paint filename and line-number in colors.
 +
 + * "git merge-file" learned to use custom conflict marker size and also use
 +   the "union merge" behaviour.
 +
 + * "git notes" command has been rewritten in C and learned quite a
 +   many commands.
 +
 + * "git request-pull" identifies the commit the request is relative to in
 +   a more readable way.
 +
 + * "git reset" learned "--keep" option that lets you discard commits
 +   near the tip while preserving your local changes in a way similar
 +   to how "git checkout branch" does.
 +
 + * "git svn" should work better when interacting with repositories
 +   with CRLF line endings.
 +
 + * "git imap-send" learned to support CRAM-MD5 authentication.
 +
 +Fixes since v1.7.0
 +------------------
 +
 +All of the fixes in v1.7.0.X maintenance series are included in this
 +release, unless otherwise noted.
 +
 + * "git add frotz/nitfol" did not complain when the entire frotz/ directory
 +   was ignored.
 +
 +---
 +exec >/var/tmp/1
 +echo O=$(git describe)
- O=v1.7.0.2-322-g4e7d08a
++O=v1.7.0.2-323-g0d0925c
 +git shortlog --no-merges ^maint $O..
diff --combined Documentation/git-clone.txt
index 43cfba0e45,d15cb17d78..dc7d3d17b1
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -102,8 -102,7 +102,8 @@@ objects from the source repository int
  
  --verbose::
  -v::
 -	Run verbosely.
 +	Run verbosely. Does not affect the reporting of progress status
 +	to the standard error stream.
  
  --progress::
  	Progress status is reported on the standard error stream
@@@ -150,7 -149,8 +150,7 @@@
  
  --template=<template_directory>::
  	Specify the directory from which templates will be used;
 -	if unset the templates are taken from the installation
 -	defined default, typically `/usr/share/git-core/templates`.
 +	(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
  
  --depth <depth>::
  	Create a 'shallow' clone with a history truncated to the
@@@ -187,7 -187,7 +187,7 @@@ include::urls.txt[
  Examples
  --------
  
- Clone from upstream::
+ * Clone from upstream:
  +
  ------------
  $ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
@@@ -196,7 -196,7 +196,7 @@@ $ mak
  ------------
  
  
- Make a local clone that borrows from the current directory, without checking things out::
+ * Make a local clone that borrows from the current directory, without checking things out:
  +
  ------------
  $ git clone -l -s -n . ../copy
@@@ -205,7 -205,7 +205,7 @@@ $ git show-branc
  ------------
  
  
- Clone from upstream while borrowing from an existing local directory::
+ * Clone from upstream while borrowing from an existing local directory:
  +
  ------------
  $ git clone --reference my2.6 \
@@@ -215,14 -215,14 +215,14 @@@ $ cd my2.
  ------------
  
  
- Create a bare repository to publish your changes to the public::
+ * Create a bare repository to publish your changes to the public:
  +
  ------------
  $ git clone --bare -l /home/proj/.git /pub/scm/proj.git
  ------------
  
  
- Create a repository on the kernel.org machine that borrows from Linus::
+ * Create a repository on the kernel.org machine that borrows from Linus:
  +
  ------------
  $ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \