UI, Workflows & Features
+ * A new mode for push, "simple", which is a cross between "current"
+ and "upstream", has been introduced. "git push" without any refspec
+ will push the current branch out to the same name at the remote
+ repository only when it is set to track the branch with the same
+ name over there. The plan is to make this mode the new default
+ value when push.default is not configured.
+
+ * A couple of commands learned the "--column" option to produce
+ columnar output.
+
* A third-party tool "git subtree" is distributed in contrib/
+ * Error messages given when @{u} is used for a branch without its
+ upstream configured have been clatified.
+
* Even with "-q"uiet option, "checkout" used to report setting up
tracking. Also "branch" learned the "-q"uiet option to squelch
informational message.
+ * Your build platform may support hardlinks but you may prefer not to
+ use them, e.g. when installing to DESTDIR to make a tarball and
+ untarring on a filesystem that has poor support for hardlinks.
+ There is a Makefile option NO_INSTALL_HARDLINKS for you.
+
* The smart-http backend used to always override GIT_COMMITTER_*
variables with REMOTE_USER and REMOTE_ADDR, but these variables are
now preserved when set.
needed such treatment are now reported to the end user, so that the
result in them can be eyeballed with extra care.
+ * The output from "diff/log --stat" used to always allocate 4 columns
+ to show the number of modified lines, but not anymore.
+
+ * "git difftool" learned the "--dir-diff" option to spawn external
+ diff tools that can compare two directory hierarchies at a time
+ after populating two temporary directories, instead of running an
+ instance of the external tool once per a file pair.
+
* The "fmt-merge-msg" command learns to list the primary contributors
involved in the side topic you are merging.
- * The cases "git push" fails due to non-ff can be broken into three
- categories; each case is given a separate advise message.
+ * "git rebase" learned to optionally keep commits that do not
+ introduce any change in the original history.
+
+ * "git push --recurse-submodules" learned to optionally look into the
+ histories of submodules bound to the superproject and push them
+ out.
* A 'snapshot' request to "gitweb" honors If-Modified-Since: header,
based on the commit date.
+ * "gitweb" learned to highlight the patch it outputs even more.
+
Foreign Interface
- * "git p4" has been moved out of contrib/ area.
+ * "git svn" used to die with unwanted SIGPIPE when talking with HTTP
+ server that uses keep-alive.
+
+ * "git svn" learned to use platform specific authentication
+ providers, e.g. gnome-keyring, kwallet, etc.
-Performance
+ * "git p4" has been moved out of contrib/ area and has seen more work
+ on importing labels as tags from (and exporting tags as labels to)
+ p4.
+
+Performance and Internal Implementation (please report possible regressions)
+
+ * An experimental "version 4" format of the index file has been
+ introduced to reduce on-disk footprint and I/O overhead.
+
+ * "git archive" learned to produce its output without reading the
+ blob object it writes out in memory in its entirety.
+
+ * The code to compute hash values for lines used by the internal diff
+ engine was optimized on little-endian machines, using the same
+ trick the kernel folks came up with.
* "git apply" had some memory leaks plugged.
one-by-one. Now they are collected in the queue unordered first,
and sorted immediately before getting used.
-Internal Implementation (please report possible regressions)
-
- * "git rev-parse --show-prefix" used to emit nothing when run at the
- top-level of the working tree, but now it gives a blank line.
-
- * Minor memory leak during unpack_trees (hence "merge" and "checkout"
- to check out another branch) has been plugged.
-
* More lower-level commands learned to use the streaming API to read
from the object store without keeping everything in core.
systems, run-command API now uses SHELL_PATH, not /bin/sh, when
spawning an external command (not applicable to Windows port).
+ * The API to iterate over refs/ hierarchy has been tweaked to allow
+ walking only a subset of it more efficiently.
+
Also contains minor documentation updates and code clean-ups.
releases are contained in this release (see release notes to them for
details).
- * "git fetch" that recurses into submodules on demand did not check
- if it needs to go into submodules when non branches (most notably,
- tags) are fetched.
- (merge a6801ad jl/maint-submodule-recurse-fetch later to maint).
-
- * "git blame" started missing quite a few changes from the origin
- since we stopped using the diff minimalization by default in v1.7.2
- era.
- (merge 059a500 jc/maint-blame-minimal later to maint).
-
- * "log -p --graph" used with "--stat" had a few formatting error.
- (merge e2c5966 lp/maint-diff-three-dash-with-graph later to maint).
-
- * Giving "--continue" to a conflicted "rebase -i" session skipped a
- commit that only results in changes to submodules.
- (merge a6754cd jk/rebase-i-submodule-conflict-only later to maint).
-
- * When PATH contains an unreadable directory, alias expansion code
- did not kick in, and failed with an error that said "git-subcmd"
- was not found.
- (merge 38f865c jk/run-command-eacces later to maint).
-
- * The 'push to upstream' implementation was broken in some corner
- cases. "git push $there" without refspec, when the current branch
- is set to push to a remote different from $there, used to push to
- $there using the upstream information to a remote unreleated to
- $there.
- (merge 135dade jc/push-upstream-sanity later to maint).
-
- * "git clean -d -f" (not "-d -f -f") is supposed to protect nested
- working trees of independent git repositories that exist in the
- current project working tree from getting removed, but the
- protection applied only to such working trees that are at the
- top-level of the current project by mistake.
- (merge ae2f203 jc/maint-clean-nested-worktree-in-subdir later to maint).
-
- * Rename detection logic used to match two empty files as renames
- during merge-recursive, leading unnatural mismerges.
- (merge 4f7cb99 jk/diff-no-rename-empty later to maint).
-
- * An age-old corner case bug in combine diff (only triggered with -U0
- and the hunk at the beginning of the file needs to be shown) has
- been fixed.
- (merge e5e9b56 rs/combine-diff-zero-context-at-the-beginning later to maint).
-
- * When "git commit --template F" errors out because the user did not
- touch the message, it claimed that it aborts due to "empty
- message", which was utterly wrong.
- (merge 1f08c2c jc/commit-unedited-template later to maint).
-
- * "git add -p" is not designed to deal with unmerged paths but did
- not exclude them and tried to apply funny patches only to fail.
- (merge 4066bd6 jk/add-p-skip-conflicts later to maint).
-
- * "git commit --author=$name" did not tell the name that was being
- recorded in the resulting commit to hooks, even though it does do
- so when the end user overrode the authorship via the
- "GIT_AUTHOR_NAME" environment variable.
- (merge 7dfe8ad jc/commit-hook-authorship later to maint).
-
- * The regexp configured with diff.wordregex was incorrectly reused
- across files.
- (merge 6440d34 tr/maint-word-diff-regex-sticky later to maint).
-
- * Running "notes merge --commit" failed to perform correctly when run
- from any directory inside $GIT_DIR/. When "notes merge" stops with
- conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
- to resolve it.
- (merge dabba59 jh/notes-merge-in-git-dir-worktree later to maint).
+ * The DWIM behaviour for "log --pretty=format:%gd -g" was somewhat
+ broken and gave undue precedence to configured log.date, causing
+ "git stash list" to show "stash@{time stamp string}".
+ (merge 55ccf85 jk/maint-reflog-walk-count-vs-time later to maint).
+
+ * Running "git checkout" on an unborn branch used to corrupt HEAD.
+ (merge 8338f77 ef/checkout-empty later to maint).
+
+ * When checking out another commit from an already detached state, we
+ used to report all commits that are not reachable from any of the
+ refs as lossage, but some of them might be reachable from the new
+ HEAD, and there is no need to warn about them.
+ (merge 5d88639 js/checkout-detach-count later to maint).
+
+ * Some time ago, "git clone" lost the progress output for its
+ "checkout" phase; when run without any "--quiet" option, it should
+ give progress to the lengthy operation.
+ (merge 8f63da1 ef/maint-clone-progress-fix later to maint).
+
+ * "git status --porcelain" ignored "--branch" option by mistake. The
+ output for "git status --branch -z" was also incorrect and did not
+ terminate the record for the current branch name with NUL as asked.
+ (merge d4a6bf1 jk/maint-status-porcelain-z-b later to maint).
+
+ * "git diff --stat" used to fully count a binary file with modified
+ execution bits whose contents is unmodified, which was not quite
+ right.
+
+ * "log -z --pretty=tformat:..." did not terminate each record with
+ NUL. The fix is not entirely correct when the output also asks for
+ --patch and/or --stat, though.
+ (merge fafd382 jk/maint-tformat-with-z later to maint).