From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Mar 2010 00:00:22 +0000 (-0700)
Subject: Merge branch 'maint-1.6.6' into maint
X-Git-Tag: v1.7.0.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d16a5dafdcec037631a5453ca7923992ce27a151?ds=inline;hp=-c

Merge branch 'maint-1.6.6' into maint

* maint-1.6.6:
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
---

d16a5dafdcec037631a5453ca7923992ce27a151
diff --combined Documentation/git-clone.txt
index 88ea6246a1,b49de66764..d15cb17d78
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -29,7 -29,7 +29,7 @@@ arguments will in addition merge the re
  current master branch, if any.
  
  This default configuration is achieved by creating references to
 -the remote branch heads under `$GIT_DIR/refs/remotes/origin` and
 +the remote branch heads under `refs/remotes/origin` and
  by initializing `remote.origin.url` and `remote.origin.fetch`
  configuration variables.
  
@@@ -96,19 -96,13 +96,19 @@@ objects from the source repository int
  
  --quiet::
  -q::
 -	Operate quietly.  This flag is also passed to the `rsync'
 +	Operate quietly.  Progress is not reported to the standard
 +	error stream. This flag is also passed to the `rsync'
  	command when given.
  
  --verbose::
  -v::
 -	Display the progress bar, even in case the standard output is not
 -	a terminal.
 +	Run verbosely.
 +
 +--progress::
 +	Progress status is reported on the standard error stream
 +	by default when it is attached to a terminal, unless -q
 +	is specified. This flag forces progress status even if the
 +	standard error stream is not directed to a terminal.
  
  --no-checkout::
  -n::
@@@ -187,7 -181,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 -190,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 -199,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 -209,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 \
diff --combined Documentation/git-reflog.txt
index 802bd5791c,6b44ee19e9..4eaa62b691
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@@ -18,9 -18,7 +18,7 @@@ depending on the subcommand
  [verse]
  'git reflog expire' [--dry-run] [--stale-fix] [--verbose]
  	[--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
- +
  'git reflog delete' ref@\{specifier\}...
- +
  'git reflog' ['show'] [log-options] [<ref>]
  
  Reflog is a mechanism to record when the tip of branches are
@@@ -60,7 -58,7 +58,7 @@@ OPTION
  	refs.
  +
  This computation involves traversing all the reachable objects, i.e. it
 -has the same cost as 'git-prune'.  Fortunately, once this is run, we
 +has the same cost as 'git prune'.  Fortunately, once this is run, we
  should not have to ever worry about missing objects, because the current
  prune and pack-objects know about reflogs and protect objects referred by
  them.
diff --combined Documentation/gitdiffcore.txt
index dcdea54df3,3cd21b64eb..9de8caf5d1
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@@ -3,7 -3,7 +3,7 @@@ gitdiffcore(7
  
  NAME
  ----
- gitdiffcore - Tweaking diff output (June 2005)
+ gitdiffcore - Tweaking diff output
  
  SYNOPSIS
  --------
@@@ -12,7 -12,7 +12,7 @@@
  DESCRIPTION
  -----------
  
 -The diff commands 'git-diff-index', 'git-diff-files', and 'git-diff-tree'
 +The diff commands 'git diff-index', 'git diff-files', and 'git diff-tree'
  can be told to manipulate differences they find in
  unconventional ways before showing 'diff' output.  The manipulation
  is collectively called "diffcore transformation".  This short note
@@@ -23,18 -23,18 +23,18 @@@ that is easier to understand than the c
  The chain of operation
  ----------------------
  
 -The 'git-diff-{asterisk}' family works by first comparing two sets of
 +The 'git diff-{asterisk}' family works by first comparing two sets of
  files:
  
 - - 'git-diff-index' compares contents of a "tree" object and the
 + - 'git diff-index' compares contents of a "tree" object and the
     working directory (when '\--cached' flag is not used) or a
     "tree" object and the index file (when '\--cached' flag is
     used);
  
 - - 'git-diff-files' compares contents of the index file and the
 + - 'git diff-files' compares contents of the index file and the
     working directory;
  
 - - 'git-diff-tree' compares contents of two "tree" objects;
 + - 'git diff-tree' compares contents of two "tree" objects;
  
  In all of these cases, the commands themselves first optionally limit
  the two sets of files by any pathspecs given on their command-lines,
@@@ -74,12 -74,12 +74,12 @@@ into another list.  There are currentl
  - diffcore-pickaxe
  - diffcore-order
  
 -These are applied in sequence.  The set of filepairs 'git-diff-{asterisk}'
 +These are applied in sequence.  The set of filepairs 'git diff-{asterisk}'
  commands find are used as the input to diffcore-break, and
  the output from diffcore-break is used as the input to the
  next transformation.  The final result is then passed to the
  output routine and generates either diff-raw format (see Output
 -format sections of the manual for 'git-diff-{asterisk}' commands) or
 +format sections of the manual for 'git diff-{asterisk}' commands) or
  diff-patch format.
  
  
@@@ -87,7 -87,7 +87,7 @@@ diffcore-break: For Splitting Up "Compl
  ----------------------------------------------------
  
  The second transformation in the chain is diffcore-break, and is
 -controlled by the -B option to the 'git-diff-{asterisk}' commands.  This is
 +controlled by the -B option to the 'git diff-{asterisk}' commands.  This is
  used to detect a filepair that represents "complete rewrite" and
  break such filepair into two filepairs that represent delete and
  create.  E.g.  If the input contained this filepair:
@@@ -123,7 -123,7 +123,7 @@@ diffcore-rename: For Detection Renames 
  
  This transformation is used to detect renames and copies, and is
  controlled by the -M option (to detect renames) and the -C option
 -(to detect copies as well) to the 'git-diff-{asterisk}' commands.  If the
 +(to detect copies as well) to the 'git diff-{asterisk}' commands.  If the
  input contained these filepairs:
  
  ------------------------------------------------
@@@ -168,11 -168,11 +168,11 @@@ number after the "-M" or "-C" option (e
  8/10 = 80%).
  
  Note.  When the "-C" option is used with `\--find-copies-harder`
 -option, 'git-diff-{asterisk}' commands feed unmodified filepairs to
 +option, 'git diff-{asterisk}' commands feed unmodified filepairs to
  diffcore mechanism as well as modified ones.  This lets the copy
  detector consider unmodified files as copy source candidates at
  the expense of making it slower.  Without `\--find-copies-harder`,
 -'git-diff-{asterisk}' commands can detect copies only if the file that was
 +'git diff-{asterisk}' commands can detect copies only if the file that was
  copied happened to have been modified in the same changeset.
  
  
@@@ -223,7 -223,7 +223,7 @@@ diffcore-pickaxe: For Detecting Additio
  
  This transformation is used to find filepairs that represent
  changes that touch a specified string, and is controlled by the
 --S option and the `\--pickaxe-all` option to the 'git-diff-{asterisk}'
 +-S option and the `\--pickaxe-all` option to the 'git diff-{asterisk}'
  commands.
  
  When diffcore-pickaxe is in use, it checks if there are
@@@ -246,7 -246,7 +246,7 @@@ diffcore-order: For Sorting the Output 
  
  This is used to reorder the filepairs according to the user's
  (or project's) taste, and is controlled by the -O option to the
 -'git-diff-{asterisk}' commands.
 +'git diff-{asterisk}' commands.
  
  This takes a text file each of whose lines is a shell glob
  pattern.  Filepairs that match a glob pattern on an earlier line