Git

Hello, I've release tig version 1.1 with a bunch of improvements and bug fixes. Note that tig no longer uses move/copy detection by default to work better on large repository. See the release notes below on how to restore the old behavior. What is ... [More] tig? ------------ Tig is an ncurses-based text-mode interface for git. It functions mainly as a git repository browser, but can also assist in staging changes for commit at chunk level and act as a pager for output from various git commands. - Homepage: http://jonas.nitro.dk/tig/ - Manual: http://jonas.nitro.dk/tig/manual.html - Tarballs: http://jonas.nitro.dk/tig/releases/ - Git URL: git://github.com/jonas/tig.git - Gitweb: http://repo.or.cz/w/tig.git Release notes ------------- Incompatibilities: - Disable diff move/copy detection by default, boosting diff performance on larger projects. Use git config 'diff.renames' option (git-wide) to set your preferred behavior. Environment variable TIG_DIFF_OPTS can be used to restore the old behavior. - Values set for author-width and filename-width will result in widths one character bigger than previously. Improvements: - Typing a text in the prompt will be interpreted as a tig command. Prefixing the command with a '!' will execute this system command in an external pager. Entering a single key will execute the corresponding key binding. - Basic support for wrapping long line in pager, diff, and stage views. Enable using: `set wrap-lines = yes`. (GH #2) - User-defined commands prefixed with a '?' means prompt before execution. Example: `bind main B !?git rebase -i %(commit)`. - User-defined commands prefixed with a '<' means exit after execution. Example: `bind main C ! - User-defined commands are executed unquoted to support shell commands. Example: `bind generic I !@sh -c "echo -n %(commit) | xclip -selection c"`. (GH #65) - Configure case-insensitive searches using: `set ignore-case = yes`. - Add "deleted mode" line type for better diff coloring. - Open editor when requesting edit action from within a file diff. - Update AX_WITH_CURSES to build under Cygwin. - Improve tigrc(5) documentation. (Debian #682766) - Allow to build on Mac OS 10.7 without the configure script. (GH #25) - Add option to split the view vertically instead of horizontally. Example: `set vertical-split = yes'. (GH #76) - Add 'show-id' and 'id-width' options to configure the display of commit IDs in the main view and ID width in the blame view. (GH #77) - Allow to override git-based encoding to UTF-8 by setting 'i18n.commitencoding' or 'gui.encoding'. - Improve autobuild support to track generated files and work with autoreconf 2.61. - Commit IDs are read from stdin when --stdin is given; works for main and diff view, e.g. `tig --no-walk --stdin < cherry-picks.txt`. - Add option to disable focusing of the child view when it's opened. Disable using: `set focus-child = no`. (GH #83) - Allow to open blob related with added content in a diff. (GH #91) Bug fixes: - Fix commit graph regression when a path spec is specified. (GH #53) - Main view: only show staged/unstaged changes for the current branch. - Support submodules created with current version of git. (GH #54) - Fix diff status message for file diffs with no content changes. - Fix parent blaming when tig is launched in subdirectory. (GH #70) - Do not show deleted branch when reloading the branch view. Change summary -------------- The diffstat and log summary for changes made in this release. .gitignore | 2 INSTALL | 8 Makefile | 35 - NEWS | 57 - autogen.sh | 22 config.make.in | 12 - configure.ac | 13 - contrib/announcement.sh | 2 - contrib/aspell.dict | 338 ------ contrib/ax_with_curses.m4 | 544 --- contrib/config.make-Darwin | 3 contrib/tig.spec.in | 4 contrib/update-release-docs.sh | 53 git.h | 36 - io.c | 64 - io.h | 9 - manual.txt | 47 - refs.c | 2 - test-graph.c | 2 - tig.1.txt | 3 - tig.c | 960 --------- tig.h | 51 - tigrc.5.txt | 142 - 23 files changed, 1806 insertions( ), 603 deletions(-) 1 Beat Bolli 1 Donald Chai 1 Douglas Livingstone 1 Hugo Schmitt 1 Jiri Jaburek 43 Jonas Fonseca 2 Petr Uzel 2 Rich Healey 1 Ryan Schlesinger 8 Samuel Bronson 3 Valentin Haenel 1 Victor Foitzik 7 Vivien Didelot 1 Štěpán Němec -- Jonas Fonseca [Less]

A release candidate Git v1.8.0-rc2 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 6c8076b3bcf08ffc53a64bbfb0fa69f82096f711 ... [More] git-1.8.0.rc2.tar.gz 86aca88717928d9d3a38c47a315d2c57402747ca git-htmldocs-1.8.0.rc2.tar.gz f4023824ee6b3ad561dba5dbdfe6e07532904a27 git-manpages-1.8.0.rc2.tar.gz Also the following public repositories all have a copy of the v1.8.0-rc2 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Things seem to have calmed down and hopefully we can have the final 1.8.0 without regression soon. ---------------------------------------------------------------- Changes since v1.8.0-rc1 are as follows: Ben Walton (1): tests: "cp -a" is a GNUism Jonathan Nieder (2): git svn: work around SVN 1.7 mishandling of svn:special changes svn test: escape peg revision separator using empty peg rev Junio C Hamano (2): gitcli: parse-options lets you omit tail of long options Git 1.8.0-rc2 Nguyễn Thái Ngọc Duy (2): gitignore.txt: suggestions how to get literal # or ! at the beginning attr: a note about the order of .gitattributes lookup Ramkumar Ramachandra (1): Git url doc: mark ftp/ftps as read-only and deprecate them Ramsay Allan Jones (1): MALLOC_CHECK: Allow checking to be disabled from config.mak Simon Ruderich (1): l10n: de.po: fix a few minor typos Øyvind A. Holm (1): configure.ac: Add missing comma to CC_LD_DYNPATH [Less]

A release candidate Git v1.8.0-rc1 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 625f820554f19f76da86258b7cc67408da032fea ... [More] git-1.8.0.rc1.tar.gz 47be50c68d9fcd1c83bfea01c18a6e3f2abd37b8 git-htmldocs-1.8.0.rc1.tar.gz 7854c309bd9befcb0cd737eb6c17085084a458fd git-manpages-1.8.0.rc1.tar.gz Also the following public repositories all have a copy of the v1.8.0-rc1 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.8.0 Release Notes (draft) ======================== Backward compatibility notes ---------------------------- In the next major release (*not* in 1.8.0 but the one that comes after that), we will change the behavior of the "git push" command. When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics so far (all your branches were sent to the remote as long as there already are branches of the same name over there). We will now use the "simple" semantics, that pushes the current branch to the branch with the same name only when the current branch is set to integrate with that remote branch. There is a user preference configuration variable "push.default" to change this, and "git push" will warn about the upcoming change until you set this variable. "git branch --set-upstream" is deprecated and may be removed in a relatively distant future. "git branch [-u|--set-upstream-to]" has been introduced with a saner order of arguments. Updates since v1.7.12 --------------------- UI, Workflows & Features * A credential helper for Win32 to allow access to the keychain of the logged-in user has been added. * An initial port to HP NonStop. * A credential helper to allow access to the Gnome keyring has been added. * When "git am" sanitizes the "Subject:" line, we strip the prefix from "Re: subject" and also from a less common "re: subject", but left the even less common "RE: subject" intact. We strip that now, too. * It was tempting to say "git branch --set-upstream origin/master", but that tells Git to arrange the local branch "origin/master" to integrate with the currently checked out branch, which is highly unlikely what the user meant. The option is deprecated; use the new "--set-upstream-to" (with a short-and-sweet "-u") option instead. * "git cherry-pick" learned the "--allow-empty-message" option to allow it to replay a commit without any log message. * After "git cherry-pick -s" gave control back to the user asking help to resolve conflicts, concluding "git commit" used to need to be run with "-s" if the user wants to sign it off; now the command leaves the sign-off line in the log template. * "git daemon" learned the "--access-hook" option to allow an external command to decline service based on the client address, repository path, etc. * "git difftool --dir-diff" learned to use symbolic links to prepare a temporary copy of the working tree when available. * "git grep" learned to use a non-standard pattern type by default if a configuration variable tells it to. * "git log -g" learned the "--grep-reflog=" option to limit its output to commits with a reflog message that matches the given pattern. * "git merge-base" learned the "--is-ancestor A B" option to tell if A is an ancestor of B. The result is indicated by its exit status code. * "git mergetool" now allows users to override the actual command used with the mergetool.$name.cmd configuration variable even for built-in mergetool backends. * The "-Xours" backend option to "git merge -s recursive" now takes effect even on binary files. * "git rebase -i" learned the "--edit-todo" option to open an editor to edit the instruction sheet. Foreign Interface * "git svn" has been updated to work with SVN 1.7. * "git p4" learned the "--conflicts" option to specify what to do when encountering a conflict during "p4 submit". Performance, Internal Implementation, etc. (please report possible regressions) * Git ships with a fall-back regexp implementation for platforms with buggy regexp library, but it was easy for people to keep using their platform regexp by mistake. A new test has been added to check this. * The "check-docs" build target has been updated and greatly simplified. * The test suite is run under MALLOC_CHECK_ when running with a glibc that supports the feature. * The documentation in the TeXinfo format was using indented output for materials meant to be examples that are better typeset in monospace. * Compatibility wrapper around some mkdir(2) implementations that reject parameters with trailing slash has been introduced. * Compatibility wrapper for systems that lack usable setitimer() has been added. * The option parsing of "git checkout" had error checking, dwim and defaulting missing options, all mixed in the code, and issuing an appropriate error message with useful context was getting harder. The code has been reorganized to allow giving a proper diagnosis when the user says "git checkout -b -t foo bar" (e.g. "-t" is not a good name for a branch). * Many internal uses of a "git merge-base" equivalent were only to see if one commit fast-forwards to the other, which did not need the full set of merge bases to be computed. They have been updated to use less expensive checks. * The heuristics to detect and silently convert latin1 to utf8 when we were told to use utf-8 in the log message has been transplanted from "mailinfo" to "commit" and "commit-tree". * Messages given by "git -h" from many subcommands have been marked for translation. Also contains minor documentation updates and code clean-ups. Fixes since v1.7.12 ------------------- Unless otherwise noted, all the fixes since v1.7.12 in the maintenance track are contained in this release (see release notes to them for details). * The attribute system may be asked for a path that itself or its leading directories no longer exists in the working tree, and it is fine if we cannot open .gitattribute file in such a case. Failure to open per-directory .gitattributes with error status other than ENOENT and ENOTDIR should be diagnosed, but it wasn't. * When looking for $HOME/.gitconfig etc., it is OK if we cannot read them because they do not exist, but we did not diagnose existing files that we cannot read. * When "git am" is fed an input that has multiple "Content-type: ..." header, it did not grok charset= attribute correctly. * "git am" mishandled a patch attached as application/octet-stream (e.g. not text/*); Content-Transfer-Encoding (e.g. base64) was not honored correctly. * "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got confused on a case insensitive filesystem and failed to do so. * Even during a conflicted merge, "git blame $path" always meant to blame uncommitted changes to the "working tree" version; make it more useful by showing cleanly merged parts as coming from the other branch that is being merged. * It was unclear in the documentation for "git blame" that it is unnecessary for users to use the "--follow" option. * Output from "git branch -v" contains "(no branch)" that could be localized, but the code to align it along with the names of branches was counting in bytes, not in display columns. * "git cherry-pick A C B" used to replay changes in A and then B and then C if these three commits had committer timestamps in that order, which is not what the user who said "A C B" naturally expects. * A repository created with "git clone --single" had its fetch refspecs set up just like a clone without "--single", leading the subsequent "git fetch" to slurp all the other branches, defeating the whole point of specifying "only this branch". * Documentation talked about "first line of commit log" when it meant the title of the commit. The description was clarified by defining how the title is decided and rewording the casual mention of "first line" to "title". * "git cvsimport" did not thoroughly cleanse tag names that it inferred from the names of the tags it obtained from CVS, which caused "git tag" to barf and stop the import in the middle. * Earlier we made the diffstat summary line that shows the number of lines added/deleted localizable, but it was found irritating having to see them in various languages on a list whose discussion language is English, and this change has been reverted. * "git fetch --all", when passed "--no-tags", did not honor the "--no-tags" option while fetching from individual remotes (the same issue existed with "--tags", but the combination "--all --tags" makes much less sense than "--all --no-tags"). * "git fetch" over http had an old workaround for an unlikely server misconfiguration; it turns out that this hurts debuggability of the configuration in general, and has been reverted. * "git fetch" over http advertised that it supports "deflate", which is much less common, and did not advertise the more common "gzip" on its Accept-Encoding header. * "git gc --auto" notified the user that auto-packing has triggered even under the "--quiet" option. * After "gitk" showed the contents of a tag, neither "Reread references" nor "Reload" updated what is shown as the contents of it when the user overwrote the tag with "git tag -f". * "git log --all-match --grep=A --grep=B" ought to show commits that mention both A and B, but when these three options are used with --author or --committer, it showed commits that mention either A or B (or both) instead. * "git p4", when "--use-client-spec" and "--detect-branches" are used together, misdetected branches. * "git receive-pack" (the counterpart to "git push") did not give progress output while processing objects it received to the puser when run over the smart-http protocol. * When you misspell the command name you give to the "exec" action in the "git rebase -i" instruction sheet you were told that 'rebase' is not a git subcommand from "git rebase --continue". * The subcommand in "git remote" to remove a defined remote was "rm" and the command did not take a fully-spelled "remove". * The interactive prompt that "git send-email" gives was error prone. It asked "What e-mail address do you want to use?" with the address it guessed (correctly) the user would want to use in its prompt, tempting the user to say "y". But the response was taken as "No, please use 'y' as the e-mail address instead", which is most certainly not what the user meant. * "git show --format='%ci'" did not give the timestamp correctly for commits created without human readable name on the "committer" line. * "git show --quiet" ought to be a synonym for "git show -s", but wasn't. * "git submodule frotz" was not diagnosed as "frotz" being an unknown subcommand to "git submodule"; the user instead got a complaint that "git submodule status" was run with an unknown path "frotz". * "git status" honored the ignore=dirty settings in .gitmodules but "git commit" didn't. ---------------------------------------------------------------- Changes since v1.8.0-rc0 are as follows: Ammon Riley (1): Make git-svn branch patterns match complete URL Eric Wong (1): git-svn: use path accessor for Git::SVN objects Jonathan Nieder (2): Git::SVN: rename private path field git-svn: keep leading slash when canonicalizing paths (fallback case) Junio C Hamano (7): log --grep-reflog: reject the option without -g Start preparing for 1.7.12.3 t1450: the order the objects are checked is undefined Update draft release notes to 1.8.0 paint_down_to_common(): parse commit before relying on its timestamp Git 1.7.12.3 Git 1.8.0-rc1 Linus Torvalds (1): mailinfo: don't require "text" mime type for attachments Michael J Gruber (1): RelNotes/1.8.0: various typo and style fixes Nguyễn Thái Ngọc Duy (3): grep: prepare for new header field filter revision: add --grep-reflog to filter commits by reflog messages revision: make --grep search in notes too if shown Peter Krefting (1): l10n: Fix to Swedish translation Ramkumar Ramachandra (1): Documentation: mention `push.default` in git-push.txt Robert Luberda (1): t9164: Add missing quotes in test Steven Walter (2): git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip git-svn.perl: keep processing all commits in parents_exclude Tobias Ulmer (1): silence git gc --auto --quiet output [Less]

The latest maintenance release Git v1.7.12.3 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: a071f03f6aab76b283828db1fdedbedb90085eb5 ... [More] git-1.7.12.3.tar.gz 6f976c27aab7250f1a35b2b002ac7a07c3266cf4 git-htmldocs-1.7.12.3.tar.gz 49584f0b72e4a13f9a4df771bbde9cf70f25d317 git-manpages-1.7.12.3.tar.gz Also the following public repositories all have a copy of the v1.7.12.3 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git 1.7.12.3 Release Notes ========================== Fixes since v1.7.12.2 --------------------- * "git am" mishandled a patch attached as application/octet-stream (e.g. not text/*); Content-Transfer-Encoding (e.g. base64) was not honored correctly. * It was unclear in the documentation for "git blame" that it is unnecessary for users to use the "--follow" option. * A repository created with "git clone --single" had its fetch refspecs set up just like a clone without "--single", leading the subsequent "git fetch" to slurp all the other branches, defeating the whole point of specifying "only this branch". * "git fetch" over http had an old workaround for an unlikely server misconfiguration; it turns out that this hurts debuggability of the configuration in general, and has been reverted. * "git fetch" over http advertised that it supports "deflate", which is much less common, and did not advertise the more common "gzip" on its Accept-Encoding header. * "git receive-pack" (the counterpart to "git push") did not give progress output while processing objects it received to the puser when run over the smart-http protocol. * "git status" honored the ignore=dirty settings in .gitmodules but "git commit" didn't. Also contains a handful of documentation updates. ---------------------------------------------------------------- Changes since v1.7.12.2 are as follows: Jeff King (3): receive-pack: redirect unpack-objects stdout to /dev/null receive-pack: send pack-processing stderr over sideband receive-pack: drop "n/a" on unpacker errors Junio C Hamano (3): git blame: document that it always follows origin across whole-file renames Start preparing for 1.7.12.3 Git 1.7.12.3 Linus Torvalds (1): mailinfo: don't require "text" mime type for attachments Orgad Shaneh (1): commit: pay attention to submodule.$name.ignore in .gitmodules Peter Krefting (1): l10n: Fix to Swedish translation Ralf Thielow (1): clone --single: limit the fetch refspec to fetched branch Ramkumar Ramachandra (1): submodule: if $command was not matched, don't parse other args Shawn O. Pearce (2): Revert "retry request without query when info/refs?query fails" Enable info/refs gzip decompression in HTTP client [Less]

A release candidate Git v1.8.0-rc0 is now available for testing at the usual places. There are a couple of leftover features we might merge before the final release, but other than that, this is meant to be more or less feature-complete preview of ... [More] the upcoming 1.8.0. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: a5143163b9d17e1afd7e66d7c6e7457c2e09a022 git-1.8.0.rc0.tar.gz 679891dad4b0168ddd618c1de05978e35189c1bf git-htmldocs-1.8.0.rc0.tar.gz eab59abd44a941e382eca6ae5e1d357b337328d0 git-manpages-1.8.0.rc0.tar.gz Also the following public repositories all have a copy of the v1.8.0-rc0 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.8.0 Release Notes (draft) ======================== Backward compatibility notes ---------------------------- In the next major release, we will change the behaviour of the "git push" command. When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics (all your branches were sent to the remote as long as there already are branches of the same name over there). We will use the "simple" semantics, that pushes the current branch to the branch with the same name only when the current branch is set to integrate with that remote branch. There is a user preference configuration variable "push.default" to change this, and "git push" will warn about the upcoming change until you set this variable. "git branch --set-upstream" is deprecated and may be removed in a relatively distant future. "git branch [-u|--set-upstream-to]" has been introduced with a saner order of arguments. Updates since v1.7.12 --------------------- UI, Workflows & Features * A credential helper for Win32 to allow access to the keychain of the logged-in user has been added. * An initial port to HP NonStop. * A credential helper to allow access to the Gnome keyring has been added. * When "git am" sanitizes the Subject: line, we strip the prefix from "Re: subject" and also from a less common "re: subject", but left even less common "RE: subject" intact. * It was tempting to say "git branch --set-upstream origin/master", but that tells Git to arrange the local branch "origin/master" to integrate with the currently checked out branch, which is highly unlikely what the user meant. The option is deprecated; use the new "--set-upstream-to" (with a short-and-sweet "-u") option instead. * "git cherry-pick" learned the "--allow-empty-message" option to allow it to replay a commit without any log message. * After "git cherry-pick -s" gave control back to the user asking help to resolve conflicts, concluding "git commit" used to need to be run with "-s" if the user wants to sign it off; now the command leaves the sign-off line in the log template. * "git daemon" learned the "--access-hook" option to allow an external command to decline service based on the client address, repository path, etc. * "git difftool --dir-diff" learned to use symbolic links to prepare temporary copy of the working tree when available. * "git grep" learned to use a non-standard pattern type by default if a configuration variable tells it to. * "git merge-base" learned "--is-ancestor A B" option to tell if A is an ancestor of B. The result is indicated by its exit status code. * "git mergetool" allows users to override the actual command used with the mergetool.$name.cmd configuration variable even for built-in mergetool backends. * The "-Xours" backend option to "git merge -s recursive" now takes effect even on binary files. * "git rebase -i" learned the "--edit-todo" option to open an editor to edit the insn sheet. Foreign Interface * "git svn" has been updated to work with SVN 1.7. * "git p4" learned "--conflicts" option to specify what to do when encountering a conflict during "p4 submit". Performance, Internal Implementation, etc. (please report possible regressions) * Git ships with a fall-back regexp implementation for platforms with buggy regexp library, but it was easy for people to keep using their platform regexp. A new test has been added to check this. * The "check-docs" build target has been updated and greatly simplified. * The test suite is run under MALLOC_CHECK_ when running with glibc that supports the feature. * The documentation in the TeXinfo format was using indented output for materials meant to be examples that are better typeset in monospace. * Compatibility wrapper around some mkdir(2) implementations that reject parameter with trailing slash has been introduced. * Compatibility wrapper for systems that lack usable setitimer() has been added. * The option parsing of "git checkout" had error checking, dwim and defaulting missing options, all mixed in the code, and issuing an appropriate error message with useful context was getting harder. The code has been reorganized to allow giving a proper diagnosis when the user says "git checkout -b -t foo bar" (e.g. "-t" is not a good name for a branch). * Many internal uses of "git merge-base" equivalent were only to see if one commit fast-forwards to the other, which did not need the full set of merge bases to be computed. They have been updated to use less expensive checks. * The heuristics to detect and silently convert latin1 to utf8 when we were told to use utf-8 in the log message has been transplanted from "mailinfo" to "commit" and "commit-tree". * Messages given by "git -h" from many subcommands have been marked for translation. Also contains minor documentation updates and code clean-ups. Fixes since v1.7.12 ------------------- Unless otherwise noted, all the fixes since v1.7.12 in the maintenance track are contained in this release (see release notes to them for details). * The attribute system may be asked for a path that itself or its leading directories no longer exists in the working tree, and it is fine if we cannot open .gitattribute file in such a case. Failure to open per-directory .gitattributes with error status other than ENOENT and ENOTDIR should be diagnosed, but it wasn't. * When looking for $HOME/.gitconfig etc., it is OK if we cannot read them because they do not exist, but we did not diagnose existing files that we cannot read. * When "git am" is fed an input that has multiple "Content-type: ..." header, it did not grok charset= attribute correctly. * "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got confused on a case insensitive filesystem and failed to do so. * Even during a conflicted merge, "git blame $path" always meant to blame uncommitted changes to the "working tree" version; make it more useful by showing cleanly merged parts as coming from the other branch that is being merged. * It was unclear in the documentation for "git blame" that it is unnecessary for users to use the "--follow" option. (merge e5dce96 jc/blame-follows-renames later to maint). * Output from "git branch -v" contains "(no branch)" that could be localized, but the code to align it along with the names of branches were counting in bytes, not in display columns. * "git cherry-pick A C B" used to replay changes in A and then B and then C if these three commits had committer timestamps in that order, which is not what the user who said "A C B" naturally expects. * A repository created with "git clone --single" had its fetch refspecs set up just like a clone without "--single", leading the subsequent "git fetch" to slurp all the other branches, defeating the whole point of specifying "only this branch". (merge 31b808a rt/maint-clone-single later to maint). * Documentation talked about "first line of commit log" when it meant the title of the commit. The description was clarified by defining how the title is decided and rewording the casual mention of "first line" to "title". * "git cvsimport" did not thoroughly cleanse tag names that it inferred from the names of the tags it obtained from CVS, which caused "git tag" to barf and stop the import in the middle. * Earlier we made the diffstat summary line that shows the number of lines added/deleted localizable, but it was found irritating having to see them in various languages on a list whose discussion language is English. * "git fetch --all", when passed "--no-tags", did not honor the "--no-tags" option while fetching from individual remotes (the same issue existed with "--tags", but combination "--all --tags" makes much less sense than "--all --no-tags"). * "git fetch" over http had an old workaround for an unlikely server misconfiguration; it turns out that this hurts debuggability of the configuration in general, and has been reverted. (merge 6ac964a sp/maint-http-info-refs-no-retry later to maint). * "git fetch" over http advertised that it supports "deflate", which is much less common, and did not advertise more common "gzip" on its Accept-Encoding header. (merge aa90b96 sp/maint-http-enable-gzip later to maint). * After "gitk" showed the contents of a tag, neither "Reread references" nor "Reload" did not update what is shown as the contents of it, when the user overwrote the tag with "git tag -f". * "git log --all-match --grep=A --grep=B" ought to show commits that mention both A and B, but when these three options are used with --author or --committer, it showed commits that mention either A or B (or both) instead. * "git p4", when "--use-client-spec" and "--detect-branches" are used together, misdetected branches. * "git receive-pack" (the counterpart to "git push") did not give progress output while processing objects it received to the puser when run over the smart-http protocol. (merge 74eb32d jk/receive-pack-unpack-error-to-pusher later to maint). * When you misspell the command name you give to the "exec" action in the "git rebase -i" insn sheet, you are told that 'rebase' is not a git subcommand from "git rebase --continue". * The subcommand in "git remote" to remove a defined remote was "rm" and the command did not take a fully-spelled "remove". * The interactive prompt "git send-email" gives was error prone. It asked "What e-mail address do you want to use?" with the address it guessed (correctly) the user would want to use in its prompt, tempting the user to say "y". But the response was taken as "No, please use 'y' as the e-mail address instead", which is most certainly not what the user meant. * "git show --format='%ci'" did not give timestamp correctly for commits created without human readable name on "committer" line. * "git show --quiet" ought to be a synonym for "git show -s", but wasn't. * "git submodule frotz" was not diagnosed as "frotz" being an unknown subcommand to "git submodule"; the user instead got a complaint that "git submodule status" was run with an unknown path "frotz". (merge af9c9f9 rr/maint-submodule-unknown-cmd later to maint). * "git status" honored the ignore=dirty settings in .gitmodules but "git commit" didn't. (merge 8f6811e os/commit-submodule-ignore later to maint). [Less]

The latest maintenance release Git v1.7.12.2 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 277b759139ddb62c6935da37de8a483e2c234a97 ... [More] git-1.7.12.2.tar.gz 5722156394c7478b2339a1d87aa894bc4d2f5d6b git-htmldocs-1.7.12.2.tar.gz 8cf6fd255e83226b4abcdcd68dcf315c1995fd92 git-manpages-1.7.12.2.tar.gz Also the following public repositories all have a copy of the v1.7.12.2 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git 1.7.12.2 Release Notes ========================== Fixes since v1.7.12.1 --------------------- * When "git am" is fed an input that has multiple "Content-type: ..." header, it did not grok charset= attribute correctly. * Even during a conflicted merge, "git blame $path" always meant to blame uncommitted changes to the "working tree" version; make it more useful by showing cleanly merged parts as coming from the other branch that is being merged. * "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got confused on a case insensitive filesystem and failed to do so. * "git fetch --all", when passed "--no-tags", did not honor the "--no-tags" option while fetching from individual remotes (the same issue existed with "--tags", but combination "--all --tags" makes much less sense than "--all --no-tags"). * "git log/diff/format-patch --stat" showed the "N line(s) added" comment in user's locale and caused careless submitters to send patches with such a line in them to projects whose project language is not their language, mildly irritating others. Localization to the line has been disabled for now. * "git log --all-match --grep=A --grep=B" ought to show commits that mention both A and B, but when these three options are used with --author or --committer, it showed commits that mention either A or B (or both) instead. * The subcommand to remove the definition of a remote in "git remote" was named "rm" even though all other subcommands were spelled out. Introduce "git remote remove" to remove confusion, and keep "rm" as a backward compatible synonym. Also contains a handful of documentation updates. ---------------------------------------------------------------- Changes since v1.7.12.1 are as follows: Dan Johnson (1): fetch --all: pass --tags/--no-tags through to each remote David Gould (1): run-command.c: fix broken list iteration in clear_child_for_cleanup Felipe Contreras (1): completion: fix shell expansion of items Jeff King (4): argv-array: add pop function argv-array: fix bogus cast when freeing array fetch: use argv_array instead of hand-building arrays Revert "completion: fix shell expansion of items" Jens Lehmann (1): submodule: use argv_array instead of hand-building arrays Jeremy White (1): Documentation: describe subject more precisely Jonathan "Duke" Leto (1): Improve the description of GIT_PS1_SHOWUPSTREAM Junio C Hamano (11): mailinfo: strip "RE: " prefix blame $path: avoid getting fooled by case insensitive filesystems blame: allow "blame file" in the middle of a conflicted merge grep: teach --debug option to dump the parse tree log --grep/--author: honor --all-match honored for multiple --grep patterns log: document use of multiple commit limiting options grep.c: mark private file-scope symbols as static mailinfo: do not concatenate charset= attribute values from mime headers grep.c: make two symbols really file-scope static this time Start preparation for 1.7.12.2 Git 1.7.12.2 Michael J Gruber (6): grep: show --debug output only once t7810-grep: bring log --grep tests in common form t7810-grep: test multiple --grep with and without --all-match t7810-grep: test multiple --author with --all-match t7810-grep: test interaction of multiple --grep and --author options t7810-grep: test --all-match with multiple --grep and --author options Nguyễn Thái Ngọc Duy (3): remote: prefer subcommand name 'remove' to 'rm' doc: move rev-list option - from git-log.txt to rev-list-options.txt Revert diffstat back to English Ralf Thielow (1): l10n: de.po: correct translation of a 'rebase' message Stefan Naewe (1): ls-remote: document the '--get-url' option Stephen Boyd (1): Documentation: Document signature showing options Thynson (2): l10n: Unify the translation for '(un)expected' l10n: Improve many translation for zh_CN [Less]

Hello all, We would like to ask you a few questions about your use of the Git version control system. This survey is mainly to understand who is using Git, how and why. The results will be published to the Git wiki on the GitSurvey2012 page ... [More] (https://git.wiki.kernel.org/index.php/GitSurvey2012) and discussed on the git mailing list. The survey would be open from 26 September till 15 October 2012. Please devote a few minutes of your time to fill this simple questionnaire, it will help a lot the git community to understand your needs, what you like of Git, and of course what you don't like of it. The survey can be found here: http://tinyurl.com/GitSurvey2012 https://www.survs.com/survey/QC8HVCPBGM There is also alternate version which does not require cookies, but it doesn't allow one to go back to response and edit it. http://tinyurl.com/GitSurvey2012-anon https://www.survs.com/survey/ZO2EF5XB5D P.S. At request I can open a separate channel in survey, with a separate survey URL, so that responses from particular site or organization could be separated out. Please send me a email with name of channel, and I will return with a separate survey URL to use. P.P.S. Different announcements use different URLs (different channels) to better track where one got information about this survey. -- Jakub Narębski on behalf of Git Development Community -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release Git v1.7.12.1 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: c5227b5202947bba3d63dca72662fad02d208800 ... [More] git-1.7.12.1.tar.gz b42d5db34612825676d0a231cf9c566f8ad45e9f git-htmldocs-1.7.12.1.tar.gz 2d9c267c5370cdceb2e67f67abf5b152b0c18db9 git-manpages-1.7.12.1.tar.gz Also the following public repositories all have a copy of the v1.7.12.1 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git 1.7.12.1 Release Notes ========================== Fixes since v1.7.12 ------------------- * "git apply -p0" did not parse pathnames on "diff --git" line correctly. This caused patches that had pathnames in no other places to be mistakenly rejected (most notably, binary patch that does not rename nor change mode). Textual patches, renames or mode changes have preimage and postimage pathnames in different places in a form that can be parsed unambiguously and did not suffer from this problem. * "git cherry-pick A C B" used to replay changes in A and then B and then C if these three commits had committer timestamps in that order, which is not what the user who said "A C B" naturally expects. * "git commit --amend" let the user edit the log message and then died when the human-readable committer name was given insufficiently by getpwent(3). * Some capabilities were asked by fetch-pack even when upload-pack did not advertise that they are available. fetch-pack has been fixed not to do so. * "git diff" had a confusion between taking data from a path in the working tree and taking data from an object that happens to have name 0{40} recorded in a tree. * "git for-each-ref" did not correctly support more than one --sort option. * "git log .." errored out saying it is both rev range and a path when there is no disambiguating "--" is on the command line. Update the command line parser to interpret ".." as a path in such a case. * The "--topo-order", "--date-order" (and the lack of either means the default order) options to "rev-list" and "log" family of commands were poorly described in the documentation. * "git prune" without "-v" used to warn about leftover temporary files (which is an indication of an earlier aborted operation). * Pushing to smart HTTP server with recent Git fails without having the username in the URL to force authentication, if the server is configured to allow GET anonymously, while requiring authentication for POST. * The reflog entries left by "git rebase" and "git rebase -i" were inconsistent (the interactive one gave an abbreviated object name). * When "git push" triggered the automatic gc on the receiving end, a message from "git prune" that said it was removing cruft leaked to the standard output, breaking the communication protocol. * "git show --quiet" ought to be a synonym for "git show -s", but wasn't. * "git show --format='%ci'" did not give timestamp correctly for commits created without human readable name on "committer" line. * "git send-email" did not unquote encoded words that appear on the header correctly, and lost "_" from strings. * The interactive prompt "git send-email" gives was error prone. It asked "What e-mail address do you want to use?" with the address it guessed (correctly) the user would want to use in its prompt, tempting the user to say "y". But the response was taken as "No, please use 'y' as the e-mail address instead", which is most certainly not what the user meant. * "gitweb" when used with PATH_INFO failed to notice directories with SP (and other characters that need URL-style quoting) in them. * When the user gives an argument that can be taken as both a revision name and a pathname without disambiguating with "--", we used to give a help message "Use '--' to separate". The message has been clarified to show where that '--' goes on the command line. * When the user exports a non-default IFS without HT, scripts that rely on being able to parse "ls-files -s | while read a b c..." started to fail. Protect them from such a misconfiguration. * The attribute system may be asked for a path that itself or its leading directories no longer exists in the working tree, and it is fine if we cannot open .gitattribute file in such a case. Failure to open per-directory .gitattributes with error status other than ENOENT and ENOTDIR should be diagnosed, but it wasn't. * After "gitk" showed the contents of a tag, neither "Reread references" nor "Reload" did not update what is shown as the contents of it, when the user overwrote the tag with "git tag -f". * "ciabot" script (in contrib/) has been updated with extensive documentation. * "git-jump" script (in contrib/) did not work well when diff.noprefix or diff.mnemonicprefix is in effect. * Older parts of the documentation described as if having a regular file in .git/refs/ hierarchy were the only way to have branches and tags, which is not true for quite some time. * A utility shell function test_seq has been added as a replacement for the 'seq' utility found on some platforms. * Compatibility wrapper to learn the maximum number of file descriptors we can open around sysconf(_SC_OPEN_MAX) and getrlimit(RLIMIT_NO_FILE) has been introduced for portability. * We used curl_easy_strerror() without checking version of cURL, breaking the build for versions before curl 7.12.0. * Code to work around MacOS X UTF-8 gotcha has been cleaned up. * Fallback 'getpass' implementation made unportable use of stdio API. * The "--rebase" option to "git pull" can be abbreviated to "-r", but we didn't document it. * It was generally understood that "--long-option"s to many of our subcommands can be abbreviated to the unique prefix, but it was not easy to find it described for new readers of the documentation set. * The synopsis said "checkout [-B branch]" to make it clear the branch name is a parameter to the option, but the heading for the option description was "-B::", not "-B branch::", making the documentation misleading. Also contains numerous documentation updates. ---------------------------------------------------------------- Changes since v1.7.12 are as follows: Adam Butcher (1): Fix '\ No newline...' annotation in rewrite diffs Adam Spiers (1): Add missing -z to git check-attr usage text for consistency with man page Andreas Schwab (1): Documentation/git-filter-branch: Move note about effect of removing commits Brandon Casey (2): t/t5400: demonstrate breakage caused by informational message from prune prune.c: only print informational message in show_only or verbose mode David Aguilar (2): gitk: Teach "Reread references" to reload tags gitk: Rename 'tagcontents' to 'cached_tagcontent' Eric S. Raymond (4): fast-import: document the --done option contrib/ciabot: Get ciabot configuration from git variables Improved documentation for the ciabot scripts. Make the ciabot scripts completely self-configuring in the normal case. Felipe Contreras (1): gitk: Avoid Meta1-F5 Heiko Voigt (2): Let submodule command exit with error status if path does not exist Documentation/CodingGuidelines: spell out more shell guidelines Jay Soffian (1): gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO Jeff King (29): diff: do not use null sha1 as a sentinel value do not write null sha1s to on-disk index fsck: detect null sha1 in tree entries include agent identifier in capability string docs: monospace listings in docbook output check-docs: mention gitweb specially check-docs: update non-command documentation list command-list: add git-sh-i18n command-list: mention git-credential-* helpers check-docs: factor out command-list check-docs: list git-gui as a command check-docs: drop git-help special-case check-docs: get documented command list from Makefile send-pack: fix capability-sending logic do not send client agent unless server does first parse_feature_request: make it easier to see feature values fetch-pack: mention server version with verbose output config: warn on inaccessible files gitignore: report access errors of exclude files attr: warn on inaccessible attribute files t5550: put auth-required repo in auth/dumb t5550: factor out http auth setup t/lib-httpd: only route auth/dumb to dumb repos t/lib-httpd: recognize */smart/* repos as smart-http t: test basic smart-http authentication t: test http access to "half-auth" repositories http: factor out http error code handling http: prompt for credentials on failed POST log: fix --quiet synonym for -s Joachim Schmitz (2): http.c: don't use curl_easy_strerror prior to curl-7.12.0 sha1_file.c: introduce get_max_fd_limit() helper Junio C Hamano (34): test: rename $satisfied to $satisfied_prereq test: allow prerequisite to be evaluated lazily config: "git config baa" should exit with status 1 t7406: fix misleading "rev-parse --max-count=1 HEAD" sane_execvp(): ignore non-directory on $PATH Documentation: do not mention .git/refs/* directories receive-pack: do not leak output from auto-gc to standard output sh-setup: protect from exported IFS fetch-pack: do not ask for unadvertised capabilities send-email: validate & reconfirm interactive responses rev-list docs: clarify --topo-order description gitcli: describe abbreviation of long options Documentation: update the introductory section git-config doc: unconfuse an example precompose-utf8: do not call checks for non-ascii "utf8" warn_on_inaccessible(): a helper to warn on inaccessible paths specifying ranges: we did not mean to make ".." an empty set mergetool: style fixes Prepare for 1.7.11.6 apply: compute patch->def_name correctly under -p0 doc: "git checkout -b/-B/--orphan" always takes a branch name split_ident_line(): make best effort when parsing author/committer line Document file-glob for "git checkout -- '*.c'" gitcli: formatting fix gitcli: contrast wildcard given to shell and to git Almost 1.7.11.6 Start preparing for 1.7.12.1 Git 1.7.11.6 Further merging down for 1.7.12.1 Further merging in preparation for 1.7.12.1 attr: failure to open a .gitattributes file is OK with ENOTDIR Git 1.7.11.7 Draft release notes to 1.7.12.1 Git 1.7.12.1 Kacper Kornet (2): t6300: test sort with multiple keys for-each-ref: Fix sort with multiple keys Martin von Zweigbergk (4): add tests for 'git rebase --keep-empty' teach log --no-walk=unsorted, which avoids sorting demonstrate broken 'git cherry-pick three one two' cherry-pick/revert: respect order of revisions to pick Matthieu Moy (1): setup: clarify error messages for file/revisions ambiguity Michael Haggerty (1): git-config.txt: fix example Michael J Gruber (6): test-lib: provide case insensitivity as a prerequisite t0050: use the CASE_INSENSITIVE_FS test prereq t0050: use the SYMLINKS test prereq test-lib: provide UTF8 behaviour as a prerequisite rebase -i: use full onto sha1 in reflog t3910: use the UTF8_NFD_TO_NFC test prereq Michał Kiedrowicz (1): tests: Introduce test_seq Miklos Vajna (1): man: git pull -r is a short for --rebase Mischa POSLAWSKY (1): git-jump: ignore (custom) prefix in diff mode Nguyễn Thái Ngọc Duy (1): read_index_from: remove bogus errno assignments Paul Gortmaker (1): apply: delete unused deflate_origlen from patch struct Phil Hord (2): test: git-stash conflict sets up rerere stash: invoke rerere in case of conflict Philip Oakley (1): Doc: Improve shallow depth wording Ramkumar Ramachandra (1): t/perf: add "trash directory" to .gitignore Ramsay Allan Jones (1): test-regex: Add a test to check for a bug in the regex routines Robin Rosenberg (1): cleanup precompose_utf8 Stefan Zager (1): Make 'git submodule update --force' always check out submodules. Stephen Boyd (1): send-email: initial_to and initial_reply_to are both optional Thomas Rast (3): send-email: improve RFC2047 quote parsing diff_setup_done(): return void merge-recursive: eliminate flush_buffer() in favor of write_in_full() Wesley J. Landaker (1): Documentation: indent-with-non-tab uses "equivalent tabs" not 8 Yacine Belkadi (1): completion: add --no-edit to git-commit -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A maintenance release Git v1.7.11.7 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 30c7aafaa31002ca52bc45dbd0908e63b00015dd ... [More] git-1.7.11.7.tar.gz bdcd5009498bc961757915dae30f5fefd6435c59 git-htmldocs-1.7.11.7.tar.gz 9fb4bb051822168e41424524a4a325207f308507 git-manpages-1.7.11.7.tar.gz Also the following public repositories all have a copy of the v1.7.11.7 tag and the maint-1.7.11 branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.11.7 Release Notes =========================== Fixes since v1.7.11.6 --------------------- * The synopsis said "checkout [-B branch]" to make it clear the branch name is a parameter to the option, but the heading for the option description was "-B::", not "-B branch::", making the documentation misleading. * Git ships with a fall-back regexp implementation for platforms with buggy regexp library, but it was easy for people to keep using their platform regexp. A new test has been added to check this. * "git apply -p0" did not parse pathnames on "diff --git" line correctly. This caused patches that had pathnames in no other places to be mistakenly rejected (most notably, binary patch that does not rename nor change mode). Textual patches, renames or mode changes have preimage and postimage pathnames in different places in a form that can be parsed unambiguously and did not suffer from this problem. * After "gitk" showed the contents of a tag, neither "Reread references" nor "Reload" did not update what is shown as the contents of it, when the user overwrote the tag with "git tag -f". * "git for-each-ref" did not currectly support more than one --sort option. * "git log .." errored out saying it is both rev range and a path when there is no disambiguating "--" is on the command line. Update the command line parser to interpret ".." as a path in such a case. * Pushing to smart HTTP server with recent Git fails without having the username in the URL to force authentication, if the server is configured to allow GET anonymously, while requiring authentication for POST. * "git show --format='%ci'" did not give timestamp correctly for commits created without human readable name on "committer" line. (merge e27ddb6 jc/maint-ident-missing-human-name later to maint). * "git show --quiet" ought to be a synonym for "git show -s", but wasn't. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A maintenance release Git v1.7.11.6 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: f678531535643806733e8c7e87db77386c48738b ... [More] git-1.7.11.6.tar.gz e6ccf6cffa3b69dc5d658f43bb8a10ed70b176f2 git-htmldocs-1.7.11.6.tar.gz 7bbb12429e65184d9462dfc01b104a4780bc67a8 git-manpages-1.7.11.6.tar.gz Also the following public repositories all have a copy of the v1.7.11.6 tag and the maint-1.7.11 branch that the tag points at: ;; url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git [repo seems to be having a problem right now] Git v1.7.11.6 Release Notes =========================== Fixes since v1.7.11.5 --------------------- * "ciabot" script (in contrib/) has been updated with extensive documentation. * "git foo" errored out with "Not a directory" when the user had a non-directory on $PATH, and worse yet it masked an alias "foo" from running. * When the user exports a non-default IFS without HT, scripts that rely on being able to parse "ls-files -s | while read a b c..." started to fail. Protect them from such a misconfiguration. * When the user gives an argument that can be taken as both a revision name and a pathname without disambiguating with "--", we used to give a help message "Use '--' to separate". The message has been clarified to show where that '--' goes on the command line. * Documentation for the configuration file format had a confusing example. * Older parts of the documentation described as if having a regular file in .git/refs/ hierarchy were the only way to have branches and tags, which is not true for quite some time. * It was generally understood that "--long-option"s to many of our subcommands can be abbreviated to the unique prefix, but it was not easy to find it described for new readers of the documentation set. * The "--topo-order", "--date-order" (and the lack of either means the default order) options to "rev-list" and "log" family of commands were poorly described in the documentation. * "git commit --amend" let the user edit the log message and then died when the human-readable committer name was given insufficiently by getpwent(3). * The exit status code from "git config" was way overspecified while being incorrect. The implementation has been updated to give the documented status for a case that was documented, and introduce a new code for "all other errors". * The output from "git diff -B" for a file that ends with an incomplete line did not put "\ No newline..." on a line of its own. * "git diff" had a confusion between taking data from a path in the working tree and taking data from an object that happens to have name 0{40} recorded in a tree. * The "--rebase" option to "git pull" can be abbreviated to "-r", but we didn't document it. * When "git push" triggered the automatic gc on the receiving end, a message from "git prune" that said it was removing cruft leaked to the standard output, breaking the communication protocol. * The reflog entries left by "git rebase" and "git rebase -i" were inconsistent (the interactive one gave an abbreviated object name). * "git send-email" did not unquote encoded words that appear on the header correctly, and lost "_" from strings. * "git stash apply/pop" did not trigger "rerere" upon conflicts unlike other mergy operations. * "git submodule path" did not error out when the path to the submodule was misspelt. * "git submodule update -f" did not update paths in the working tree that has local changes. (merge 01d4721 sz/submodule-force-update later to maint). * "gitweb" when used with PATH_INFO failed to notice directories with SP (and other characters that need URL-style quoting) in them. * Fallback 'getpass' implementation made unportable use of stdio API. * A utility shell function test_seq has been added as a replacement for the 'seq' utility found on some platforms. ---------------------------------------------------------------- Changes since v1.7.11.5 are as follows: Adam Butcher (1): Fix '\ No newline...' annotation in rewrite diffs Ben Walton (1): Enable HAVE_DEV_TTY for Solaris Brandon Casey (1): t/t5400: demonstrate breakage caused by informational message from prune Eric S. Raymond (3): contrib/ciabot: Get ciabot configuration from git variables Improved documentation for the ciabot scripts. Make the ciabot scripts completely self-configuring in the normal case. Heiko Voigt (2): Let submodule command exit with error status if path does not exist Documentation/CodingGuidelines: spell out more shell guidelines Jay Soffian (1): gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO Jeff King (6): commit: check committer identity more strictly diff: do not use null sha1 as a sentinel value do not write null sha1s to on-disk index fsck: detect null sha1 in tree entries terminal: seek when switching between reading and writing docs: monospace listings in docbook output Junio C Hamano (13): config: "git config baa" should exit with status 1 t7406: fix misleading "rev-parse --max-count=1 HEAD" sane_execvp(): ignore non-directory on $PATH Documentation: do not mention .git/refs/* directories receive-pack: do not leak output from auto-gc to standard output sh-setup: protect from exported IFS rev-list docs: clarify --topo-order description gitcli: describe abbreviation of long options git-config doc: unconfuse an example mergetool: style fixes Prepare for 1.7.11.6 Almost 1.7.11.6 Git 1.7.11.6 Luka Perkov (1): builtin.h: remove unused cmd_ declarations Martin von Zweigbergk (1): add tests for 'git rebase --keep-empty' Matthieu Moy (1): setup: clarify error messages for file/revisions ambiguity Michael Haggerty (1): git-config.txt: fix example Michael J Gruber (1): rebase -i: use full onto sha1 in reflog Michał Kiedrowicz (1): tests: Introduce test_seq Miklos Vajna (1): man: git pull -r is a short for --rebase Nguyễn Thái Ngọc Duy (1): read_index_from: remove bogus errno assignments Paul Gortmaker (1): apply: delete unused deflate_origlen from patch struct Phil Hord (2): test: git-stash conflict sets up rerere stash: invoke rerere in case of conflict Stefan Zager (1): Make 'git submodule update --force' always check out submodules. Thomas Rast (3): send-email: improve RFC2047 quote parsing diff_setup_done(): return void merge-recursive: eliminate flush_buffer() in favor of write_in_full() -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]