GIT_MERGE_AUTOEDIT=no
export GIT_MERGE_AUTOEDIT
- to disable this behaviour (if you want your users to explain their
+ to disable this behavior (if you want your users to explain their
merge commits, you do not have to do anything). Alternatively, you
can give the "--no-edit" option to individual invocations of the
"git merge" command if you know everybody who uses your script has
Git v1.7.8 or newer.
+ * The "--binary/-b" options to "git am" have been a no-op for quite a
+ while and were deprecated in mid 2008 (v1.6.0). When you give these
+ options to "git am", it will now warn and ask you not to use them.
+
+ * When you do not tell which branches and tags to push to the "git
+ push" command in any way, the command used "matching refs" rule to
+ update remote branches and tags with branches and tags with the
+ same name you locally have. In future versions of Git, this will
+ change to push out only your current branch according to either the
+ "upstream" or the "current" rule. Although "upstream" may be more
+ powerful once the user understands Git better, the semantics
+ "current" gives is simpler and easier to understand for beginners
+ and may be a safer and better default option. We haven't decided
+ yet which one to switch to.
+
Updates since v1.7.9
--------------------
UI, Workflows & Features
+ * various "gitk" updates.
+ - show the path to the top level directory in the window title
+ - update preference edit dialog
+ - display file list correctly when directories are given on command line
+ - make "git-describe" output in the log message into a clickable link
+ - avoid matching the UNIX timestamp part when searching all fields
+ - give preference to symbolic font names like sans & monospace
+ - allow comparing two commits using a mark
+ - "gitk" honors log.showroot configuration.
+
* Teams for localizing the messages from the Porcelain layer of
commands are starting to form, thanks to Jiang Xin who volunteered
- to be the localization coordinator. An initial set of translated
- messages for simplified chinese is available.
+ to be the localization coordinator. Translated messages for
+ simplified Chinese, Swedish and Portuguese are available.
* The configuration mechanism learned an "include" facility; an
assignment to the include.path pseudo-variable causes the named
* Project search in "gitweb" shows the substring that matched in the
project name and description highlighted.
+ * HTTP transport learned to authenticate with a proxy if needed.
+
+ * A new script "diffall" is added to contrib/; it drives an
+ external tool to perform a directory diff of two Git revisions
+ in one go, unlike "difftool" that compares one file at a time.
+
Foreign Interface
* Improved handling of views, labels and branches in "git-p4" (in contrib).
releases are contained in this release (see release notes to them for
details).
- * "git bundle" did not record boundary commits correctly when there
- are many of them.
- (merge efe4be1 tr/maint-bundle-boundary later to maint).
-
- * "git diff-index" and its friends at the plumbing level showed the
- "diff --git" header and nothing else for a path whose cached stat
- info is dirty without actual difference when asked to produce a
- patch. This was a longstanding bug that we could have fixed long
- time ago.
- (merge b3f01ff jc/maint-diff-patch-header later to maint).
-
- * The code to synthesize the fake ancestor tree used by 3-way merge
- fallback in "git am" was not prepared to read a patch created with
- a non-standard -p<num> value.
- (merge a61ba26 jc/am-3-nonstandard-popt later to maint).
-
- * "gitweb" used to drop warnings in the log file when "heads" view is
- accessed in a repository whose HEAD does not point at a valid
- branch.
-
- * "gitweb" did use quotemeta() to prepare search string when asked to
- do a fixed-string project search, but did not use it by mistake and
- used the user-supplied string instead.
- (merge e65ceb6 jn/maint-do-not-match-with-unsanitized-searchtext later to maint).
-
----
-exec >/var/tmp/1
-O=v1.7.10-rc0-15-g9a4c97e
-echo O=$(git describe)
-git log --first-parent --oneline ^maint $O..
-echo
-git shortlog --no-merges ^maint $O..
+ * Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work
+ with versions of Perl older than 5.8.3.
+ (merge 5eb660e ab/perl-i18n later to maint).
+
+ * "git tag -s" honored "gpg.program" configuration variable since
+ 1.7.9, but "git tag -v" and "git verify-tag" didn't.
+ (merge a2c2506 az/verify-tag-use-gpg-config later to maint).
+
+ * "configure" script learned to take "--with-sane-tool-path" from the
+ command line to record SANE_TOOL_PATH (used to avoid broken platform
+ tools in /usr/bin) in config.mak.autogen. This may be useful for
+ people on Solaris who have saner tools outside /usr/xpg[46]/bin.
+
+ * zsh port of bash completion script needed another workaround.