Merge branch 'np/relnotes-in-subdir'

* np/relnotes-in-subdir:
install-webdoc: keep installed RelNotes-*.txt
Documentation: move RelNotes into a directory of their own

diff --combined Documentation/RelNotes/1.7.3.txt
index 0000000000000000000000000000000000000000,3512bbb238efd4284b3e06f7c18b0f4231569d75..f1243ff112ad86324e3f41cea88af7087aa0cc7a
mode 000000,100644..100644
--- /dev/null
--- 2/Documentation/RelNotes/1.7.3.txt
+++ b/Documentation/RelNotes/1.7.3.txt
@@@ -1,0 -1,73 +1,81 @@@
 -O=v1.7.2.2-268-g7e42332
 -O=v1.7.2
+ Git v1.7.3 Release Notes (draft)
+ ================================
+ 
+ Updates since v1.7.2
+ --------------------
+ 
+  * git-gui got various updates and a new maintainer, Pat Thoyts.
+ 
+  * Gitweb allows its configuration to change per each request; it used to
+    read the configuration once upon startup.
+ 
+  * When git finds a corrupt object, it now reports the file that contains
+    it.
+ 
+  * "git checkout -B <it>" is a shorter way to say "git branch -f <it>"
+    followed by "git checkout <it>".
+ 
+  * When "git checkout" or "git merge" refuse to proceed in order to
+    protect local modification to your working tree, they used to stop
+    after showing just one path that might be lost.  They now show all,
+    in a format that is easier to read.
+ 
+  * "git clean" learned "-e" ("--exclude") option.
+ 
+  * Hunk headers produced for C# files by "git diff" and friends show more
+    relevant context than before.
+ 
+  * diff.ignoresubmodules configuration variable can be used to squelch the
+    differences in submodules reported when running commands (e.g. "diff",
+    "status", etc.) at the superproject level.
+ 
+  * http.useragent configuration can be used to lie who you are to your
+    restrictive firewall.
+ 
+  * "git rebase --strategy <s>" learned "-X" option to pass extra options
+    that are understood by the chosen merge strategy.
+ 
+  * "git rebase -i" learned "exec" that you can insert into the insn sheet
+    to run a command between its steps.
+ 
+  * "git rebase" between branches that have many binary changes that do
+    not conflict should be faster.
+ 
+  * "git rebase -i" peeks into rebase.autosquash configuration and acts as
+    if you gave --autosquash from the command line.
+ 
+ 
+ Also contains various documentation updates.
+ 
+ 
+ Fixes since v1.7.2
+ ------------------
+ 
+ All of the fixes in v1.7.2.X maintenance series are included in this
+ release, unless otherwise noted.
+ 
+  * "git merge -s recursive" (which is the default) did not handle cases
+    where a directory becomes a file (or vice versa) very well.
+ 
+  * "git fetch" and friends were accidentally broken for url with "+" in
+    its path, e.g. "git://git.gnome.org/gtk+".
+ 
++ * "git fetch $url" (i.e. without refspecs) was broken for quite some
++   time, if the current branch happen to be tracking some remote.
++
++ * "git note remove" created unnecessary extra commit when named object
++   did not have any note to begin with.
++
++ * "git -c foo=bar subcmd" did not work well for subcmd that is not
++   implemented as a built-in command.
++
+ ---
+ exec >/var/tmp/1
+ echo O=$(git describe master)
++O=v1.7.3-rc0
+ git shortlog --no-merges $O..master ^maint
+ exit 0
+ 
+ What did we want to do with...
+ 
+ 1e3d411 (Enable custom schemes for column colors in the graph API, 2010-07-13)

diff --combined Documentation/git.txt
index e341075078f4511d2a40dca0a2c8ae1d342e6b17,d9988f167cda86f8ea69346cfdbff11659a56587..69ef12e272ed2ee762c5f8e1319d2b690d89fbad
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -47,173 -47,173 +47,173 @@@ Documentation for older releases are av
  * link:v1.7.2.3/git.html[documentation for release 1.7.2.3]
  
  * release notes for
-   link:RelNotes-1.7.2.3.txt[1.7.2.3],
-   link:RelNotes-1.7.2.2.txt[1.7.2.2],
-   link:RelNotes-1.7.2.1.txt[1.7.2.1],
-   link:RelNotes-1.7.2.txt[1.7.2].
+   link:RelNotes/1.7.2.3.txt[1.7.2.3],
+   link:RelNotes/1.7.2.2.txt[1.7.2.2],
+   link:RelNotes/1.7.2.1.txt[1.7.2.1],
+   link:RelNotes/1.7.2.txt[1.7.2].
  
  * link:v1.7.1.2/git.html[documentation for release 1.7.1.2]
  
  * release notes for
-   link:RelNotes-1.7.1.2.txt[1.7.1.2],
-   link:RelNotes-1.7.1.1.txt[1.7.1.1],
-   link:RelNotes-1.7.1.txt[1.7.1].
+   link:RelNotes/1.7.1.2.txt[1.7.1.2],
+   link:RelNotes/1.7.1.1.txt[1.7.1.1],
+   link:RelNotes/1.7.1.txt[1.7.1].
  
  * link:v1.7.0.7/git.html[documentation for release 1.7.0.7]
  
  * release notes for
-   link:RelNotes-1.7.0.7.txt[1.7.0.7],
-   link:RelNotes-1.7.0.6.txt[1.7.0.6],
-   link:RelNotes-1.7.0.5.txt[1.7.0.5],
-   link:RelNotes-1.7.0.4.txt[1.7.0.4],
-   link:RelNotes-1.7.0.3.txt[1.7.0.3],
-   link:RelNotes-1.7.0.2.txt[1.7.0.2],
-   link:RelNotes-1.7.0.1.txt[1.7.0.1],
-   link:RelNotes-1.7.0.txt[1.7.0].
+   link:RelNotes/1.7.0.7.txt[1.7.0.7],
+   link:RelNotes/1.7.0.6.txt[1.7.0.6],
+   link:RelNotes/1.7.0.5.txt[1.7.0.5],
+   link:RelNotes/1.7.0.4.txt[1.7.0.4],
+   link:RelNotes/1.7.0.3.txt[1.7.0.3],
+   link:RelNotes/1.7.0.2.txt[1.7.0.2],
+   link:RelNotes/1.7.0.1.txt[1.7.0.1],
+   link:RelNotes/1.7.0.txt[1.7.0].
  
  * link:v1.6.6.2/git.html[documentation for release 1.6.6.2]
  
  * release notes for
-   link:RelNotes-1.6.6.2.txt[1.6.6.2],
-   link:RelNotes-1.6.6.1.txt[1.6.6.1],
-   link:RelNotes-1.6.6.txt[1.6.6].
+   link:RelNotes/1.6.6.2.txt[1.6.6.2],
+   link:RelNotes/1.6.6.1.txt[1.6.6.1],
+   link:RelNotes/1.6.6.txt[1.6.6].
  
  * link:v1.6.5.8/git.html[documentation for release 1.6.5.8]
  
  * release notes for
-   link:RelNotes-1.6.5.8.txt[1.6.5.8],
-   link:RelNotes-1.6.5.7.txt[1.6.5.7],
-   link:RelNotes-1.6.5.6.txt[1.6.5.6],
-   link:RelNotes-1.6.5.5.txt[1.6.5.5],
-   link:RelNotes-1.6.5.4.txt[1.6.5.4],
-   link:RelNotes-1.6.5.3.txt[1.6.5.3],
-   link:RelNotes-1.6.5.2.txt[1.6.5.2],
-   link:RelNotes-1.6.5.1.txt[1.6.5.1],
-   link:RelNotes-1.6.5.txt[1.6.5].
+   link:RelNotes/1.6.5.8.txt[1.6.5.8],
+   link:RelNotes/1.6.5.7.txt[1.6.5.7],
+   link:RelNotes/1.6.5.6.txt[1.6.5.6],
+   link:RelNotes/1.6.5.5.txt[1.6.5.5],
+   link:RelNotes/1.6.5.4.txt[1.6.5.4],
+   link:RelNotes/1.6.5.3.txt[1.6.5.3],
+   link:RelNotes/1.6.5.2.txt[1.6.5.2],
+   link:RelNotes/1.6.5.1.txt[1.6.5.1],
+   link:RelNotes/1.6.5.txt[1.6.5].
  
  * link:v1.6.4.4/git.html[documentation for release 1.6.4.4]
  
  * release notes for
-   link:RelNotes-1.6.4.4.txt[1.6.4.4],
-   link:RelNotes-1.6.4.3.txt[1.6.4.3],
-   link:RelNotes-1.6.4.2.txt[1.6.4.2],
-   link:RelNotes-1.6.4.1.txt[1.6.4.1],
-   link:RelNotes-1.6.4.txt[1.6.4].
+   link:RelNotes/1.6.4.4.txt[1.6.4.4],
+   link:RelNotes/1.6.4.3.txt[1.6.4.3],
+   link:RelNotes/1.6.4.2.txt[1.6.4.2],
+   link:RelNotes/1.6.4.1.txt[1.6.4.1],
+   link:RelNotes/1.6.4.txt[1.6.4].
  
  * link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
  
  * release notes for
-   link:RelNotes-1.6.3.4.txt[1.6.3.4],
-   link:RelNotes-1.6.3.3.txt[1.6.3.3],
-   link:RelNotes-1.6.3.2.txt[1.6.3.2],
-   link:RelNotes-1.6.3.1.txt[1.6.3.1],
-   link:RelNotes-1.6.3.txt[1.6.3].
+   link:RelNotes/1.6.3.4.txt[1.6.3.4],
+   link:RelNotes/1.6.3.3.txt[1.6.3.3],
+   link:RelNotes/1.6.3.2.txt[1.6.3.2],
+   link:RelNotes/1.6.3.1.txt[1.6.3.1],
+   link:RelNotes/1.6.3.txt[1.6.3].
  
  * release notes for
-   link:RelNotes-1.6.2.5.txt[1.6.2.5],
-   link:RelNotes-1.6.2.4.txt[1.6.2.4],
-   link:RelNotes-1.6.2.3.txt[1.6.2.3],
-   link:RelNotes-1.6.2.2.txt[1.6.2.2],
-   link:RelNotes-1.6.2.1.txt[1.6.2.1],
-   link:RelNotes-1.6.2.txt[1.6.2].
+   link:RelNotes/1.6.2.5.txt[1.6.2.5],
+   link:RelNotes/1.6.2.4.txt[1.6.2.4],
+   link:RelNotes/1.6.2.3.txt[1.6.2.3],
+   link:RelNotes/1.6.2.2.txt[1.6.2.2],
+   link:RelNotes/1.6.2.1.txt[1.6.2.1],
+   link:RelNotes/1.6.2.txt[1.6.2].
  
  * link:v1.6.1.3/git.html[documentation for release 1.6.1.3]
  
  * release notes for
-   link:RelNotes-1.6.1.3.txt[1.6.1.3],
-   link:RelNotes-1.6.1.2.txt[1.6.1.2],
-   link:RelNotes-1.6.1.1.txt[1.6.1.1],
-   link:RelNotes-1.6.1.txt[1.6.1].
+   link:RelNotes/1.6.1.3.txt[1.6.1.3],
+   link:RelNotes/1.6.1.2.txt[1.6.1.2],
+   link:RelNotes/1.6.1.1.txt[1.6.1.1],
+   link:RelNotes/1.6.1.txt[1.6.1].
  
  * link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
  
  * release notes for
-   link:RelNotes-1.6.0.6.txt[1.6.0.6],
-   link:RelNotes-1.6.0.5.txt[1.6.0.5],
-   link:RelNotes-1.6.0.4.txt[1.6.0.4],
-   link:RelNotes-1.6.0.3.txt[1.6.0.3],
-   link:RelNotes-1.6.0.2.txt[1.6.0.2],
-   link:RelNotes-1.6.0.1.txt[1.6.0.1],
-   link:RelNotes-1.6.0.txt[1.6.0].
+   link:RelNotes/1.6.0.6.txt[1.6.0.6],
+   link:RelNotes/1.6.0.5.txt[1.6.0.5],
+   link:RelNotes/1.6.0.4.txt[1.6.0.4],
+   link:RelNotes/1.6.0.3.txt[1.6.0.3],
+   link:RelNotes/1.6.0.2.txt[1.6.0.2],
+   link:RelNotes/1.6.0.1.txt[1.6.0.1],
+   link:RelNotes/1.6.0.txt[1.6.0].
  
  * link:v1.5.6.6/git.html[documentation for release 1.5.6.6]
  
  * release notes for
-   link:RelNotes-1.5.6.6.txt[1.5.6.6],
-   link:RelNotes-1.5.6.5.txt[1.5.6.5],
-   link:RelNotes-1.5.6.4.txt[1.5.6.4],
-   link:RelNotes-1.5.6.3.txt[1.5.6.3],
-   link:RelNotes-1.5.6.2.txt[1.5.6.2],
-   link:RelNotes-1.5.6.1.txt[1.5.6.1],
-   link:RelNotes-1.5.6.txt[1.5.6].
+   link:RelNotes/1.5.6.6.txt[1.5.6.6],
+   link:RelNotes/1.5.6.5.txt[1.5.6.5],
+   link:RelNotes/1.5.6.4.txt[1.5.6.4],
+   link:RelNotes/1.5.6.3.txt[1.5.6.3],
+   link:RelNotes/1.5.6.2.txt[1.5.6.2],
+   link:RelNotes/1.5.6.1.txt[1.5.6.1],
+   link:RelNotes/1.5.6.txt[1.5.6].
  
  * link:v1.5.5.6/git.html[documentation for release 1.5.5.6]
  
  * release notes for
-   link:RelNotes-1.5.5.6.txt[1.5.5.6],
-   link:RelNotes-1.5.5.5.txt[1.5.5.5],
-   link:RelNotes-1.5.5.4.txt[1.5.5.4],
-   link:RelNotes-1.5.5.3.txt[1.5.5.3],
-   link:RelNotes-1.5.5.2.txt[1.5.5.2],
-   link:RelNotes-1.5.5.1.txt[1.5.5.1],
-   link:RelNotes-1.5.5.txt[1.5.5].
+   link:RelNotes/1.5.5.6.txt[1.5.5.6],
+   link:RelNotes/1.5.5.5.txt[1.5.5.5],
+   link:RelNotes/1.5.5.4.txt[1.5.5.4],
+   link:RelNotes/1.5.5.3.txt[1.5.5.3],
+   link:RelNotes/1.5.5.2.txt[1.5.5.2],
+   link:RelNotes/1.5.5.1.txt[1.5.5.1],
+   link:RelNotes/1.5.5.txt[1.5.5].
  
  * link:v1.5.4.7/git.html[documentation for release 1.5.4.7]
  
  * release notes for
-   link:RelNotes-1.5.4.7.txt[1.5.4.7],
-   link:RelNotes-1.5.4.6.txt[1.5.4.6],
-   link:RelNotes-1.5.4.5.txt[1.5.4.5],
-   link:RelNotes-1.5.4.4.txt[1.5.4.4],
-   link:RelNotes-1.5.4.3.txt[1.5.4.3],
-   link:RelNotes-1.5.4.2.txt[1.5.4.2],
-   link:RelNotes-1.5.4.1.txt[1.5.4.1],
-   link:RelNotes-1.5.4.txt[1.5.4].
+   link:RelNotes/1.5.4.7.txt[1.5.4.7],
+   link:RelNotes/1.5.4.6.txt[1.5.4.6],
+   link:RelNotes/1.5.4.5.txt[1.5.4.5],
+   link:RelNotes/1.5.4.4.txt[1.5.4.4],
+   link:RelNotes/1.5.4.3.txt[1.5.4.3],
+   link:RelNotes/1.5.4.2.txt[1.5.4.2],
+   link:RelNotes/1.5.4.1.txt[1.5.4.1],
+   link:RelNotes/1.5.4.txt[1.5.4].
  
  * link:v1.5.3.8/git.html[documentation for release 1.5.3.8]
  
  * release notes for
-   link:RelNotes-1.5.3.8.txt[1.5.3.8],
-   link:RelNotes-1.5.3.7.txt[1.5.3.7],
-   link:RelNotes-1.5.3.6.txt[1.5.3.6],
-   link:RelNotes-1.5.3.5.txt[1.5.3.5],
-   link:RelNotes-1.5.3.4.txt[1.5.3.4],
-   link:RelNotes-1.5.3.3.txt[1.5.3.3],
-   link:RelNotes-1.5.3.2.txt[1.5.3.2],
-   link:RelNotes-1.5.3.1.txt[1.5.3.1],
-   link:RelNotes-1.5.3.txt[1.5.3].
+   link:RelNotes/1.5.3.8.txt[1.5.3.8],
+   link:RelNotes/1.5.3.7.txt[1.5.3.7],
+   link:RelNotes/1.5.3.6.txt[1.5.3.6],
+   link:RelNotes/1.5.3.5.txt[1.5.3.5],
+   link:RelNotes/1.5.3.4.txt[1.5.3.4],
+   link:RelNotes/1.5.3.3.txt[1.5.3.3],
+   link:RelNotes/1.5.3.2.txt[1.5.3.2],
+   link:RelNotes/1.5.3.1.txt[1.5.3.1],
+   link:RelNotes/1.5.3.txt[1.5.3].
  
  * link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
  
  * release notes for
-   link:RelNotes-1.5.2.5.txt[1.5.2.5],
-   link:RelNotes-1.5.2.4.txt[1.5.2.4],
-   link:RelNotes-1.5.2.3.txt[1.5.2.3],
-   link:RelNotes-1.5.2.2.txt[1.5.2.2],
-   link:RelNotes-1.5.2.1.txt[1.5.2.1],
-   link:RelNotes-1.5.2.txt[1.5.2].
+   link:RelNotes/1.5.2.5.txt[1.5.2.5],
+   link:RelNotes/1.5.2.4.txt[1.5.2.4],
+   link:RelNotes/1.5.2.3.txt[1.5.2.3],
+   link:RelNotes/1.5.2.2.txt[1.5.2.2],
+   link:RelNotes/1.5.2.1.txt[1.5.2.1],
+   link:RelNotes/1.5.2.txt[1.5.2].
  
  * link:v1.5.1.6/git.html[documentation for release 1.5.1.6]
  
  * release notes for
-   link:RelNotes-1.5.1.6.txt[1.5.1.6],
-   link:RelNotes-1.5.1.5.txt[1.5.1.5],
-   link:RelNotes-1.5.1.4.txt[1.5.1.4],
-   link:RelNotes-1.5.1.3.txt[1.5.1.3],
-   link:RelNotes-1.5.1.2.txt[1.5.1.2],
-   link:RelNotes-1.5.1.1.txt[1.5.1.1],
-   link:RelNotes-1.5.1.txt[1.5.1].
+   link:RelNotes/1.5.1.6.txt[1.5.1.6],
+   link:RelNotes/1.5.1.5.txt[1.5.1.5],
+   link:RelNotes/1.5.1.4.txt[1.5.1.4],
+   link:RelNotes/1.5.1.3.txt[1.5.1.3],
+   link:RelNotes/1.5.1.2.txt[1.5.1.2],
+   link:RelNotes/1.5.1.1.txt[1.5.1.1],
+   link:RelNotes/1.5.1.txt[1.5.1].
  
  * link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
  
  * release notes for
-   link:RelNotes-1.5.0.7.txt[1.5.0.7],
-   link:RelNotes-1.5.0.6.txt[1.5.0.6],
-   link:RelNotes-1.5.0.5.txt[1.5.0.5],
-   link:RelNotes-1.5.0.3.txt[1.5.0.3],
-   link:RelNotes-1.5.0.2.txt[1.5.0.2],
-   link:RelNotes-1.5.0.1.txt[1.5.0.1],
-   link:RelNotes-1.5.0.txt[1.5.0].
+   link:RelNotes/1.5.0.7.txt[1.5.0.7],
+   link:RelNotes/1.5.0.6.txt[1.5.0.6],
+   link:RelNotes/1.5.0.5.txt[1.5.0.5],
+   link:RelNotes/1.5.0.3.txt[1.5.0.3],
+   link:RelNotes/1.5.0.2.txt[1.5.0.2],
+   link:RelNotes/1.5.0.1.txt[1.5.0.1],
+   link:RelNotes/1.5.0.txt[1.5.0].
  
  * documentation for release link:v1.4.4.4/git.html[1.4.4.4],
    link:v1.3.3/git.html[1.3.3],
@@@ -639,13 -639,6 +639,13 @@@ Usually it is easier to configure any d
  personal `.ssh/config` file.  Please consult your ssh documentation
  for further details.
  
 +'GIT_ASKPASS'::
 +      If this environment variable is set, then git commands which need to
 +      acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
 +      will call this program with a suitable prompt as command line argument
 +      and read the password from its STDOUT. See also the 'core.askpass'
 +      option in linkgit:git-config[1].
 +
  'GIT_FLUSH'::
        If this environment variable is set to "1", then commands such
        as 'git blame' (in incremental mode), 'git rev-list', 'git log',