summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes-1.7.2.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/RelNotes-1.7.2.txt')
-rw-r--r--Documentation/RelNotes-1.7.2.txt38
1 files changed, 28 insertions, 10 deletions
diff --git a/Documentation/RelNotes-1.7.2.txt b/Documentation/RelNotes-1.7.2.txt
index 9f6a904..b463fd2 100644
--- a/Documentation/RelNotes-1.7.2.txt
+++ b/Documentation/RelNotes-1.7.2.txt
@@ -4,10 +4,13 @@ Git v1.7.2 Release Notes (draft)
Updates since v1.7.1
--------------------
- * core.eol configuration and eol attribute are the new way to control
- the end of line conventions for files in the working tree;
- core.autocrlf overrides it, keeping the traditional behaviour by
- default.
+ * core.eol configuration and text/eol attributes are the new way to control
+ the end of line conventions for files in the working tree.
+
+ * core.autocrlf has been made safer - it will now only handle line
+ endings for new files and files that are LF-only in the
+ repository. To normalize content that has been checked in with
+ CRLF, use the new eol/text attributes.
* The whitespace rules used in "git apply --whitespace" and "git diff"
gained a new member in the family (tab-in-indent) to help projects with
@@ -37,13 +40,20 @@ Updates since v1.7.1
* The message from "git am -3" has been improved when conflict
resolution ended up making the patch a no-op.
+ * "git blame" applies the textconv filter to the contents it works
+ on, when available.
+
* "git checkout --orphan newbranch" is similar to "-b newbranch" but
prepares to create a root commit that is not connected to any existing
commit.
- * "git cherry-pick" learned to pick a range of commits (e.g. "cherry-pick
- A..B"); this does not have nicer sequencing control "rebase [-i]" has,
- though.
+ * "git cherry-pick" learned to pick a range of commits
+ (e.g. "cherry-pick A..B" and "cherry-pick --stdin"), so did "git
+ revert"; these do not support the nicer sequencing control "rebase
+ [-i]" has, though.
+
+ * "git cherry-pick" and "git revert" learned --strategy option to specify
+ the merge strategy to be used when performing three-way merges.
* "git cvsserver" can be told to use pserver; its password file can be
stored outside the repository.
@@ -71,8 +81,12 @@ Updates since v1.7.1
* Various options to "git grep" (e.g. --count, --name-only) work better
with binary files.
+ * "git grep" learned "-Ovi" to open the files with hits in your editor.
+
* "git help -w" learned "chrome" and "chromium" browsers.
+ * "git log --decorate" shows commit decorations in various colours.
+
* "git log --follow <path>" follows across copies (it used to only follow
renames). This may make the processing more expensive.
@@ -89,16 +103,20 @@ Updates since v1.7.1
* "git remote" learned "set-branches" subcommand.
- * "git revert" learned --strategy option to specify the merge strategy.
-
* "git rev-list A..B" learned --ancestry-path option to further limit
the result to the commits that are on the ancestry chain between A and
B (i.e. commits that are not descendants of A are excluded).
+ * "git show -5" is equivalent to "git show --do-walk 5"; this is similar
+ to the update to make "git show master..next" walk the history,
+ introduced in 1.6.4.
+
* "git status [-s] --ignored" can be used to list ignored paths.
* "git status -s -b" shows the current branch in the output.
+ * "git status" learned "--ignore-submodules" option.
+
* Various "gitweb" enhancements and clean-ups, including syntax
highlighting, "plackup" support for instaweb, .fcgi suffix to run
it as FastCGI script, etc.
@@ -139,6 +157,6 @@ release, unless otherwise noted.
--
exec >/var/tmp/1
-O=v1.7.1-568-g2c177a1
+O=v1.7.2-rc0-60-g2927a50
echo O=$(git describe HEAD)
git shortlog --no-merges HEAD ^maint ^$O