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
variables with REMOTE_USER and REMOTE_ADDR, but these variables are
now preserved when set.
+ * "include.path" mechanism of the configuration files learned to
+ understand "~/path" and "~user/path".
+
* "git am" learned the "--include" option, which is an opposite of
existing the "--exclude" option.
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.
* "git svn" used to die with unwanted SIGPIPE when talking with HTTP
server that uses keep-alive.
- * "git p4" has been moved out of contrib/ area.
+ * "git svn" learned to use platform specific authentication
+ providers, e.g. gnome-keyring, kwallet, etc.
+
+ * "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)
-Performance
+ * An experimental "version 4" format of the index file has been
+ introduced to reduce on-disk footprint and I/O overhead.
+
+ * 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.
+ * "git repack" used to write out unreachable objects as loose objects
+ when repacking, even if such loose objects will immediately pruned
+ due to its age.
+
* Setting up a revision traversal with many starting points was
inefficient as these were placed in a date-order priority queue
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.
releases are contained in this release (see release notes to them for
details).
- * The i18n of error message "git stash save" was not properly done.
- (merge ed3c400 rl/maint-stash-i18n-save-error later to maint).
-
- * The report from "git fetch" said "new branch" even for a non branch
- ref.
- (merge 0997ada mb/fetch-call-a-non-branch-a-ref later to maint).
-
- * The "diff --no-index" codepath used limited-length buffers, risking
- pathnames getting truncated. Update it to use the strbuf API.
- (merge 875b91b jm/maint-strncpy-diff-no-index later to maint).
-
- * The parser in "fast-import" did not diagnose ":9" style references
- that is not followed by required SP/LF as an error.
- (merge 06454cb pw/fast-import-dataref-parsing later to maint).
-
- * When "git fetch" encounters repositories with too many references,
- the command line of "fetch-pack" that is run by a helper
- e.g. remote-curl, may fail to hold all of them. Now such an
- internal invocation can feed the references through the standard
- input of "fetch-pack".
- (merge 7103d25 it/fetch-pack-many-refs 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.
- * "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).
+ * "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).
- * "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).
+ * "git push" over smart-http lost progress output a few releases ago.
+ (merge e304aeb jk/maint-push-progress 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).
+ * A contrib script "rerere-train" did not work out of the box unless
+ user futzed with her $PATH.
+ (merge 53876fc jc/rerere-train 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).
+ * "log --graph" was not very friendly with "--stat" option and its
+ output had line breaks at wrong places.
+ (merge bafa16e lp/diffstat-with-graph later to maint).