![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 11b0b100672e477dd39e0ac10cc172cc3b307cc3..58100bf04e1c3b7e7f4440eb3df9696b3a5343df 100644 (file)
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
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 use the
- "upstream" rule to update the branch at the remote you would "pull"
- from into your current branch with your local current branch. The
- release after 1.7.10 will start issuing a warning about this change,
- to encourage you to tell the command what to push out, e.g. by setting
- push.default configuration.
+ * 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.
people on Solaris who have saner tools outside /usr/xpg[46]/bin.
* zsh port of bash completion script needed another workaround.
-
----
-exec >/var/tmp/1
-O=v1.7.10-rc2-18-gee459ba
-echo O=$(git describe)
-git log --first-parent --oneline ^maint $O..
-echo
-git shortlog --no-merges ^maint $O..