Merge branch 'gb/gitweb-snapshot-pathinfo'

[git.git] / Documentation / RelNotes-1.6.1.txt

diff --git a/Documentation/RelNotes-1.6.1.txt b/Documentation/RelNotes-1.6.1.txt
index afd1150eaa4fc17600dd948f8d7dc4ec266aa162..d0e30e95d46f561f1545fd8468ee9281a5eb482e 100644 (file)
--- a/Documentation/RelNotes-1.6.1.txt
+++ b/Documentation/RelNotes-1.6.1.txt
@@ -62,6 +62,11 @@ on.
 * "git bisect" is careful about a user mistake and suggests testing of
   merge base first when good is not a strict ancestor of bad.
 
+* "git blame" re-encodes the commit metainfo to UTF-8 from i18n.commitEncoding
+  by default.
+
+* "git check-attr --stdin" can check attributes for multiple paths.
+
 * "git checkout --track origin/hack" used to be a syntax error.  It now
   DWIMs to create a corresponding local branch "hack", i.e. acts as if you
   said "git checkout --track -b hack origin/hack".
@@ -74,6 +79,8 @@ on.
 
 * "git cherry-pick" can also utilize rerere for conflict resolution.
 
+* "git clone" learned to be verbose with -v
+
 * "git commit --author=$name" can look up author name from existing
   commits.
 
@@ -85,6 +92,12 @@ on.
 
 * "git daemon" learned --max-connections=<count> option.
 
+* "git daemon" exports REMOTE_ADDR to record client address, so that
+  spawned programs can act differently on it.
+
+* "git describe --tags" favours closer lightweight tags than farther
+  annotated tags now.
+
 * "git diff" learned to mimic --suppress-blank-empty from GNU diff via a
   configuration option.
 
@@ -99,9 +112,16 @@ on.
 
 * "git diff" hunk header pattern for ObjC has been added.
 
+* a "textconv" filter that makes binary files textual form for human
+   consumption can be specified as an attribute for paths; "git diff"
+   learnt to make use of it.
+
 * "git for-each-ref" learned "refname:short" token that gives an
   unambiguously abbreviated refname.
 
+* Auto-numbering of the subject lines is the default for "git
+  format-patch" now.
+
 * "git grep" learned to accept -z similar to GNU grep.
 
 * "git help" learned to use GIT_MAN_VIEWER environment variable before
@@ -127,9 +147,21 @@ on.
 * "git merge -s $strategy" can use a custom built strategy if you have a
   command "git-merge-$strategy" on your $PATH.
 
+* "git push" can be told to reject deletion of refs with receive.denyDeletes
+  configuration.
+
+* "git rebase" honours pre-rebase hook; use --no-verify to bypass it.
+
+* "git rebase -p" uses interactive rebase machinery now to preserve the merges.
+
 * "git reflog expire branch" can be used in place of "git reflog expire
   refs/heads/branch".
 
+* "git remote show $remote" lists remote branches one-per-line now.
+
+* when giving up resolving a conflicted merge, "git reset --hard" failed
+  to remove new paths from the working tree. [cherry-pick to 'maint'?]
+
 * "git submodule foreach" subcommand allows you to iterate over checked
   out submodules.
 
@@ -138,6 +170,8 @@ on.
 
 * "git svn branch" can create new branches on the other end.
 
+* "gitweb" can use more saner PATH_INFO based URL.
+
 (internal)
 
 * "git hash-object" learned to lie about the path being hashed, so that
@@ -147,6 +181,15 @@ on.
 * various callers of git-merge-recursive avoid forking it as an external
   process.
 
+* Git class defined in "Git.pm" can be subclasses a bit more easily.
+
+* We used to link GNU regex library as a compatibility layer for some
+  platforms, but it turns out it is not necessary on most of them.
+
+* Some path handling routines used fixed number of buffers used alternately
+  but depending on the call depth, this arrangement led to hard to track
+  bugs.  This issue is being addressed.
+
 
 Fixes since v1.6.0
 ------------------
@@ -179,6 +222,6 @@ release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.6.0.2-553-g58e0fa5
+O=v1.6.0.3-639-ga1a846a
 echo O=$(git describe master)
 git shortlog --no-merges $O..master ^maint