summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.7.4.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/RelNotes/1.7.4.txt')
-rw-r--r--Documentation/RelNotes/1.7.4.txt41
1 files changed, 35 insertions, 6 deletions
diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index c1d06694e1..ace061f5fe 100644
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -4,6 +4,10 @@ Git v1.7.4 Release Notes (draft)
Updates since v1.7.3
--------------------
+ * The documentation Makefile now assumes by default asciidoc 8 and
+ docbook-xsl >= 1.73. If you have older versions, you can set
+ ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
+
* The option parsers of various commands that create new branch (or
rename existing ones to a new name) were too loose and users were
allowed to call a branch with a name that begins with a dash by
@@ -25,17 +29,42 @@ Updates since v1.7.3
* Bash completion script in contrib/ has been adjusted to be also
usable by zsh.
+ * Different pagers can be chosen depending on which subcommand is
+ being run under the pager, using "pager.<subcommand>" variable.
+
+ * The hardcoded tab-width of 8 used in whitespace breakage checks is now
+ configurable via the attributes mechanism.
+
+ * Support of case insensitive filesystems (i.e. "core.ignorecase") has
+ been improved. For example, the gitignore mechanism didn't pay attention
+ to the case insensitivity.
+
+ * The <tree>:<path> syntax to name a blob in a tree, and :<path>
+ syntax to name a blob in the index (e.g. "master:Makefile",
+ ":hello.c") have been extended. You can start <path> with "./" to
+ implicitly have the (sub)directory you are in prefixed to the
+ lookup. Similarly, ":../Makefile" from a subdirectory would mean
+ "the Makefile of the parent directory in the index".
+
* "git blame" learned --show-email option to display the e-mail
addresses instead of the names of authors.
+ * "git commit" learned --fixup and --squash options to help later invocation
+ of the interactive rebase.
+
* "git daemon" can be built in MinGW environment.
* "git daemon" can take more than one --listen option to listen to
multiple addresses.
+ * "git describe --exact-match" was optimized not to read commit
+ objects unnecessarily.
+
* "git diff" and "git grep" learned how functions and subroutines
in Fortran look like.
+ * "git fetch" learned "--recurse-submodules" option.
+
* "git mergetool" tells vim/gvim to show three-way diff by default
(use vimdiff2/gvimdiff2 as the tool name for old behaviour).
@@ -77,11 +106,16 @@ Updates since v1.7.3
git-only login over ssh as login shell, with custom set of
commands.
+ * The current branch name in "git status" output can be colored differently
+ from the generic header color by setting "color.status.branch" variable.
+
* "git submodule sync" updates metainformation for all submodules,
not just the ones that have been checked out.
* gitweb can use custom 'highlight' command with its configuration file.
+ * other gitweb updates.
+
Also contains various documentation updates.
@@ -92,11 +126,6 @@ Fixes since v1.7.3
All of the fixes in v1.7.3.X maintenance series are included in this
release, unless otherwise noted.
- * "git checkout" removed an untracked file "foo" from the working
- tree when switching to a branch that contains a tracked path
- "foo/bar". Prevent this, just like the case where the conflicting
- path were "foo" (c752e7f..7980872d).
-
* "git log --author=me --author=her" did not find commits written by
me or by her; instead it looked for commits written by me and by
her, which is impossible.
@@ -114,6 +143,6 @@ release, unless otherwise noted.
---
exec >/var/tmp/1
-O=v1.7.3.2-450-g5b9c331
+O=v1.7.3.4-567-g38a5932
echo O=$(git describe master)
git shortlog --no-merges ^maint ^$O master