Merge git://repo.or.cz/git-gui

[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 421e569ea0620c446471dc9a29c59940b0dd1357..afd1150eaa4fc17600dd948f8d7dc4ec266aa162 100644 (file)
--- a/Documentation/RelNotes-1.6.1.txt
+++ b/Documentation/RelNotes-1.6.1.txt
@@ -16,13 +16,16 @@ on.
 * gitk can call out to git-gui to view "git blame" output; git-gui in turn
   can run gitk from its blame view.
 
-(portability)
+* Various git-gui updates including updated translations.
+
+* Various gitweb updates from repo.or.cz installation.
 
-* ...
+(portability)
 
-(documentation)
+* A few test scripts used nonportable "grep" that did not work well on
+  some platforms, e.g. Solaris.
 
-* ...
+* Sample pre-auto-gc script has OS X support.
 
 (performance)
 
@@ -35,6 +38,14 @@ on.
 * Bash completion of refnames in a repository with massive number of
   refs has been optimized.
 
+* Cygwin port uses native stat/lstat implementations when applicable,
+  which leads to improved performance.
+
+* "git push" pays attention to alternate repositories to avoid sending
+  unnecessary objects.
+
+* "git svn" can rebuild an out-of-date rev_map file.
+
 (usability, bells and whistles)
 
 * When you mistype a command name, git helpfully suggests what it guesses
@@ -42,6 +53,12 @@ on.
   to a non-zero value to accept the suggestion when git can uniquely
   guess.
 
+* "git add -N path..." adds the named paths as an empty blob, so that
+  subsequent "git diff" will show a diff as if they are creation events.
+
+* "git apply" learned --include=paths option, similar to the existing
+  --exclude=paths option.
+
 * "git bisect" is careful about a user mistake and suggests testing of
   merge base first when good is not a strict ancestor of bad.
 
@@ -49,28 +66,44 @@ on.
   DWIMs to create a corresponding local branch "hack", i.e. acts as if you
   said "git checkout --track -b hack origin/hack".
 
+* "git checkout --ours/--theirs" can be used to check out one side of a
+  conflicting merge during conflict resolution.
+
+* "git checkout -m" can be used to recreate the initial conflicted state
+  during conflict resolution.
+
 * "git cherry-pick" can also utilize rerere for conflict resolution.
 
 * "git commit --author=$name" can look up author name from existing
   commits.
 
+* output from "git commit" has been reworded in a more concise and yet
+  more informative way.
+
 * "git count-objects" reports the on-disk footprint for packfiles and
   their corresponding idx files.
 
 * "git daemon" learned --max-connections=<count> option.
 
-* "git diff" learned to mimick --suppress-blank-empty from GNU diff via a
+* "git diff" learned to mimic --suppress-blank-empty from GNU diff via a
   configuration option.
 
-* "git diff" learned to put more sensible hunk headers for Python and
-  HTML contents.
+* "git diff" learned to put more sensible hunk headers for Python,
+  HTML and ObjC contents.
 
 * "git diff" learned to vary the a/ vs b/ prefix depending on what are
   being compared, controlled by diff.mnemonicprefix configuration.
 
+* "git diff" learned --dirstat-by-file to count changed files, not number
+  of lines, when summarizing the global picture.
+
+* "git diff" hunk header pattern for ObjC has been added.
+
 * "git for-each-ref" learned "refname:short" token that gives an
   unambiguously abbreviated refname.
 
+* "git grep" learned to accept -z similar to GNU grep.
+
 * "git help" learned to use GIT_MAN_VIEWER environment variable before
   using "man" program.
 
@@ -103,12 +136,18 @@ on.
 * "git submodule sync" subcommands allows you to update the origin URL
   recorded in submodule directories from the toplevel .gitmodules file.
 
+* "git svn branch" can create new branches on the other end.
+
 (internal)
 
 * "git hash-object" learned to lie about the path being hashed, so that
   correct gitattributes processing can be done while hashing contents
   stored in a temporary file.
 
+* various callers of git-merge-recursive avoid forking it as an external
+  process.
+
+
 Fixes since v1.6.0
 ------------------
 
@@ -121,9 +160,14 @@ release, unless otherwise noted.
   is a path in it).
 
 * "git diff --stdin" used to take two trees on a line and compared them,
-  but we droppped support for such a use case long time ago.  This has
+  but we dropped support for such a use case long time ago.  This has
   been resurrected.
 
+* Giving 3 or more tree-ish to "git diff" is supposed to show the combined
+  diff from second and subsequent trees to the first one.  b75271d ("git
+  diff <tree>{3,}": do not reverse order of arguments, 2008-10-10) needs
+  to be cherry-picked to 'maint'.
+
 * "git filter-branch" failed to rewrite a tag name with slashes in it.
 
 * "git push --tags --all $there" failed with generic usage message without
@@ -135,6 +179,6 @@ release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.6.0.2-295-g34a5d35
+O=v1.6.0.2-553-g58e0fa5
 echo O=$(git describe master)
 git shortlog --no-merges $O..master ^maint