Git

Guilt v0.33 is available for download (once it mirrors out on kernel.org). Guilt (Git Quilt) is a series of bash scripts which add a Mercurial queues-like functionality and interface to git. Tarballs: ... [More] http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ Git repo: git://git.kernel.org/pub/scm/linux/kernel/git/jsipek/guilt.git This release bundles up a bunch of the fixes that were released in the various v0.32.x stable releases. The major change is the addition of support for git versions 1.7.x. As always, patches, and other feedback is welcome. Josef "Jeff" Sipek. ------------ Changes since v0.32: Dmitry Monakhov (1): guilt: allow raw patch edit Eric Sandeen (1): regression: filter usage() output Josef 'Jeff' Sipek (10): regression: fix output mismatch with git 1.6.2 select/guard: fixed bashism Guilt v0.32.1 refresh: output the patch name similarly to what quilt does {fork,import}: check patchnames for colons regression: added a new test that exercises the guilt-import code {diff,import-commit,new}: fix handling of binary files regression: change two of the test patches to handle binary files header: use exit instead of return Guilt v0.33 Theodore Ts'o (1): guilt: Add support for git version 1.7.x.y Vincent Penn [Less]

Highlight: ======= Rewrite Icon overlay code. Improve status fetch speed and reduce CPU loading. Many bugs is fixed Download: ======= http://tortoisegit.googlecode.com/files/TortoiseGit-1.4.4.0-32bit.msi ... [More] http://tortoisegit.googlecode.com/files/TortoiseGit-1.4.4.0-64bit.msi = Release 1.4.4.0 = == Features == * #379: Create Branch for remote branch do not set branch name == Bug Fix == * Fix log show mass when encode is cp1251 * Fixed issue #357: Fix line endings merging issue = Release 1.4.3.0 = * Fix explore crash when there are ignore patten at .git/info/exclude * Fixed issue #367: Last line of .gitignore ignored * Fixed issue #368: TortoiseGitBlame should not spell check by default * Fixed issue #369: TortoiseGitBlame should expand its menu items by default * Fixed issue: Compare submodule dialog show wrong subject at log dialog * Fixed issue #365: Log - enter closes dialog * Fixed issue #358: Renamed files are not properly committed, after refreshing the commit dialog * Fixed issue .git\* locked when remove git repository = Release 1.4.2.0 = == Features == * Log dialog find support search tag and branch * #354: impliment revert of this commit at log dialog * Add Merge command at log context menu * #350: Implement "Copy and rename" from context menu == Bug Fix == * Fixed issue #346: can't remove remote repos * Fixed issue #280: "Use recycle bin when reverting" does not work * Fix ignore over lay show wrong when second level directory exist .gitignore file * Fixed issue #240: Setting "Do not show the context menu for following paths:" not working properly = Release 1.4.1.0 = == Features == * #349: Offer "DCommit" instead of "Push" when working as SVN client == Bug Fix == * Fixed clone fail if msysgit version below 1.7.0.2 * Fixed Folder keep "X" delete icon after commit * Fixed some small repository can't reflect "add" * Fixed show "?" at second level directory when icon overlay using "shell" * Fixed Issue #351: "Search log messages..." in Log context menu does nothing * Fixed Issue #226: tortoisegit is searching for .git share on network drives * Fixed number of files selected is wrong at commit dialog * Fixed Issue 353: Fix Help button in the git sync dialog = Release 1.4.0.0 = == Features == * Improve Icon Overlay Rewrite icon overlay implement. TGitCache will call gitdll.dll to get HEAD tree. And direct read index files. Read .gitignore file and call gitdll.dll to judge ignore files. Can't watch untracked directroy to reduce TGitCache loading. * Git Clone Add --progress at clone dialog * Log Dialog Add antiAlias when draw cycle at log dialog * Add minimize and maximize button at rebase and sync dialog == Bug Fix == * Fixed Issue #344: Force is the default in the sync dialog * Fixed issue #343: Wrong behaviour of Show Unversioned Files checkbox at Commit dialog * Fixed issue #281: show wrong character after finish commit * Fix commitdlg can close after commit and progress scroll too much * Fixed Issue #299: Do nothing "Check For Updates..." at about dialog * Fixed Issue #333: Can't abort CherryPick * Fixed Issue #336: Text of context menu slightly wrong; replace svn with git * Fixed Issue #340: OpenSSH password dialog focus * Fixed issue #312: The number of changed files in 'Show log' window * Fixed issue #325: Would be nice to see current directory in the commit dialog * Fixed issue #329: path wrong at "Save revision to... * Fixed issue #327: Crash in the commit dialog after you changed a file for Linux formatted * Fixed issue #321: Wrong Company/Product name in Metadata * Fixed Issue Issue 309: Mispelled words in the Git Synchronization dialog * Fixed Issue 304: Adding a file in the commit dialog resets selection * Fixed issue #305: Filtering showlog make crash -- 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 release candidate Git 1.7.1.rc1 is available at the usual places for testing: http://www.kernel.org/pub/software/scm/git/ git-1.7.1.rc1.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.1.rc1.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.1.rc1.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: testing/git-*-1.7.1.rc1-1.fc11.$arch.rpm (RPM) Please test 'master', report & fix regressions. Hopefully we can do another rc during the next week and release the final one next weekend. ---------------------------------------------------------------- Changes since v1.7.1-rc0 are as follows: Brandon Casey (1): notes.h: declare bit field as unsigned to silence compiler complaints Jeff King (4): fix const-correctness of write_sha1_file fix textconv leak in emit_rewrite_diff fix typos and grammar in 1.7.1 draft release notes docs: clarify "branch -l" Jens Lehmann (2): Let check_preimage() use memset() to initialize "struct checkout" Teach diff --submodule and status to handle .git files in submodules Jonathan Nieder (1): Teach mailinfo %< as an alternative scissors mark Junio C Hamano (2): diff.c: work around pointer constness warnings Git 1.7.1-rc1 Mark Rada (6): Gitweb: add ignore and clean rules for minified files Gitweb: add support for minifying gitweb.css Gitweb: add autoconfigure support for minifiers instaweb: add minification awareness gitweb: add documentation to INSTALL regarding gitweb.js gitweb: update INSTALL to use shorter make target Michael J Gruber (2): t3301-notes: Test the creation of reflog entries refs.c: Write reflogs for notes just like for branch heads Tay Ray Chuan (2): branch: say "Reset to" in reflog entries for 'git branch -f' operations fetch/push: fix usage strings -- 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 release candidate Git 1.7.1.rc0 is available at the usual places for testing: http://www.kernel.org/pub/software/scm/git/ git-1.7.1.rc0.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.1.rc0.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.1.rc0.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: testing/git-*-1.7.1.rc0-1.fc11.$arch.rpm (RPM) ---------------------------------------------------------------- Git v1.7.1 Release Notes (draft) ================================ Updates since v1.7.0 -------------------- * Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/. * Some commands (e.g. svn and http interfaces) that interactively ask password can be told to use an external program given via GIT_ASKPASS. * Conflict markers that lead the common ancestor in diff3-style output now has a label, which hopefully would help third-party tools that expect one. * Comes with an updated bash-completion script. * "git am" learned "--keep-cr" option to handle inputs that are mixture of changes to files with and without CRLF line endings. * "git cvsimport" learned -R option to leave revision mapping between CVS revisions and resulting git commits. * "git diff --submodule" notices and descries dirty submodules. * "git for-each-ref" learned %(symref), %(symref:short) and %(flag) tokens. * "git hash-object --stdin-paths" can take "--no-filters" option now. * "git init" can be told to look at init.templatedir configuration variable (obviously that has to come from either /etc/gitconfig or $HOME/.gitconfig). * "git grep" learned "--no-index" option, to search inside contents that are not managed by git. * "git grep" learned --color=auto/always/never. * "git grep" learned to paint filename and line-number in colors. * "git log -p --first-parent -m" shows one-parent diff for merge commits, instead of showing combined diff. * "git merge-file" learned to use custom conflict marker size and also use the "union merge" behaviour. * "git notes" command has been rewritten in C and learned quite a many commands and features to help you carry notes forward across rebases and amends. * "git request-pull" identifies the commit the request is relative to in a more readable way. * "git reset" learned "--keep" option that lets you discard commits near the tip while preserving your local changes in a way similar to how "git checkout branch" does. * "git status" notices and descries dirty submodules. * "git svn" should work better when interacting with repositories with CRLF line endings. * "git imap-send" learned to support CRAM-MD5 authentication. Fixes since v1.7.0 ------------------ All of the fixes in v1.7.0.X maintenance series are included in this release, unless otherwise noted. * "git add frotz/nitfol" did not complain when the entire frotz/ directory was ignored. * "git rev-list --pretty=oneline" didn't terminate a record with LF for commits without any message. * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike newer tools in the git toolset. -- 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 1.7.0.4 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.0.4.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.0.4.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.0.4.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.0.4-1.fc11.$arch.rpm (RPM) Git v1.7.0.4 Release Notes ========================== Fixes since v1.7.0.3 -------------------- * Optimized ntohl/htonl on big-endian machines were broken. * Color values given to "color.." configuration can now have more than one attributes (e.g. "bold ul"). * "git add -u nonexistent-path" did not complain. * "git apply --whitespace=fix" didn't work well when an early patch in a patch series adds trailing blank lines and a later one depended on such a block of blank lines at the end. * "git fast-export" didn't check error status and stop when marks file cannot be opened. * "git format-patch --ignore-if-in-upstream" gave unwarranted errors when the range was empty, instead of silently finishing. * "git remote prune" did not detect remote tracking refs that became dangling correctly. And other minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.0.3 are as follows: Björn Gustavsson (5): apply: Don't unnecessarily update line lengths in the preimage apply: Remove the quick rejection test apply: Allow blank context lines to match beyond EOF t4124: Add additional tests of --whitespace=fix t3417: Add test cases for "rebase --whitespace=fix" Chris Packham (1): test for add with non-existent pathspec David Aguilar (1): difftool: Fix '--gui' when diff.guitool is unconfigured Greg Bacon (1): Documentation: Clarify support for smart HTTP backend Holger Weiß (3): Don't redefine htonl and ntohl on big-endian Link against libiconv on IRIX Documentation: show-ref s are optional Jakub Narebski (1): gitweb: git_get_project_config requires only $git_dir, not also $project Jan Stępień (1): Updated the usage string of git reset Jeff King (1): dir: fix COLLECT_IGNORED on excluded prefixes Johannes Sixt (2): diff: fix textconv error zombies Windows: fix utime() for read-only files Junio C Hamano (8): git add -u: die on unmatched pathspec color: allow multiple attributes t0050: mark non-working test as such tests for "git add ignored-dir/file" without -f refs: ref entry with NULL sha1 is can be a dangling symref t9350: fix careless use of "cd" Prepare for 1.7.0.4 Git 1.7.0.4 Kevin Ballard (1): format-patch: Squelch 'fatal: Not a range." error Markus Heidelberg (1): Documentation: explain the meaning of "-g" in git-describe output Sverre Rabbelier (1): fast-export: don't segfault when marks file cannot be opened -- 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]

In mid-2009 the EGit and JGit projects started to move to the Eclipse Foundation. Last week both projects shipped version 0.7.1, which is our first release since 0.5.0 in June 2009. Many bugs have been fixed, included the dreaded push corruption ... [More] bug. But most of the release was us figuring out how to navigate the Eclipse Foundation's processes, so there aren't many new features relative to 0.5.0. About JGit: JGit is a 100% pure-Java reimplementation of the Git version control system, licensed under a BSD style license. These days it can be found embedded in quite a few software products. Although the library development is now hosted by the Eclipse Foundation, it has no outside dependencies beyond the Java standard runtime, and the BSD licensed JSch SSH client library. * http://www.eclipse.org/jgit/ * http://www.eclipse.org/jgit/download/ About EGit: EGit is an Eclipse Team Provider plugin, providing Git features directly within an Eclipse workspace. It is built on top of the JGit library, making the plugin very portable. * http://www.eclipse.org/egit/ * http://www.eclipse.org/egit/download/ * http://download.eclipse.org/egit/updates -- Shawn. -- 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 1.7.0.3 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.0.3.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.0.3.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.0.3.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.0.3-1.fc11.$arch.rpm (RPM) Git v1.7.0.3 Release Notes ========================== Fixes since v1.7.0.2 -------------------- * Object files are created in a more ACL friendly way in repositories where group permission is ACL controlled. * "git add -i" didn't handle a deleted path very well. * "git blame" padded line numbers with one extra SP when the total number of lines was one less than multiple of ten due to an off-by-one error. * "git fetch --all/--multi" used to discard information for remotes that are fetched earlier. * "git log --author=me --grep=it" tried to find commits that have "it" or are written by "me", instead of the ones that have "it" _and_ are written by "me". * "git log -g branch" misbehaved when there was no entries in the reflog for the named branch. * "git mailinfo" (hence "git am") incorrectly removed initial indent from paragraphs. * "git prune" and "git reflog" (hence "git gc" as well) didn't honor an instruction never to expire by setting gc.reflogexpire to never. * "git push" misbehaved when branch..merge was configured without matching branch..remote. And other minor fixes and documentation updates. -- 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 1.7.0.2 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.0.2.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.0.2.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.0.2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.0.2-1.fc11.$arch.rpm (RPM) Git v1.7.0.2 Release Notes ========================== Fixes since v1.7.0.1 -------------------- * GIT_PAGER was not honored consistently by some scripted Porcelains, most notably "git am". * updating working tree files after telling git to add them to the index and while it is still working created garbage object files in the repository without diagnosing it as an error. * "git bisect -- pathspec..." did not diagnose an error condition properly when the simplification with given pathspec made the history empty. * "git rev-list --cherry-pick A...B" now has an obvious optimization when the histories haven't diverged (i.e. when one end is an ancestor of the other). * "git diff --quiet -w" did not work as expected. * "git fast-import" didn't work with a large input, as it lacked support for producing the pack index in v2 format. * "git imap-send" didn't use CRLF line endings over the imap protocol when storing its payload to the draft box, violating RFC 3501. * "git log --format='%w(x,y,z)%b'" and friends that rewrap message has been optimized for utf-8 payload. * Error messages generated on the receiving end did not come back to "git push". * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series to speed up scanning of large working tree. * "gitweb" did not diagnose parsing errors properly while reading tis configuration file. And other minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.0.1 are as follows: Bert Wesarg (1): unset GREP_OPTIONS in test-lib.sh Christian Couder (1): bisect: error out when passing bad path parameters Dmitry Potapov (1): hash-object: don't use mmap() for small files Erik Faye-Lund (1): run-command: support custom fd-set in async Gabriel Filion (1): require_work_tree broken with NONGIT_OK Hitoshi Mitake (1): git-imap-send: Convert LF to CRLF before storing patch to draft box Jakub Narebski (2): gitweb: Die if there are parsing errors in config file gitweb: Fix project-specific feature override behavior Jonathan Nieder (8): Fix 'git var' usage synopsis Make 'git var GIT_PAGER' always print the configured pager git.1: Clarify the behavior of the --paginate option git svn: Fix launching of pager am: Fix launching of pager tests: Add tests for automatic use of pager t7006-pager: if stdout is not a terminal, make a new one tests: Fix race condition in t7006-pager Junio C Hamano (6): t6000lib: Fix permission lib-patch-mode.sh: Fix permission status: preload index to optimize lstat(2) calls Start preparing for 1.7.0.2 Update draft release notes to 1.7.0.2 Git 1.7.0.2 Larry D'Anna (2): git diff --quiet -w: check and report the status git-diff: add a test for git diff --quiet -w Matthieu Moy (1): stash: suggest the correct command line for unknown options. Michal Sojka (1): Remove extra '-' from git-am(1) Nicolas Pitre (8): fast-import: start using struct pack_idx_entry fast-import: use sha1write() for pack data fast-import: use write_idx_file() instead of custom code fast-import: make default pack size unlimited fast-import: honor pack.indexversion and pack.packsizelimit config vars fast-import: use the diff_delta() max_delta_size argument sha1_file: don't malloc the whole compressed result when writing out objects sha1_file: be paranoid when creating loose objects René Scharfe (4): utf8.c: remove print_wrapped_text() utf8.c: remove print_spaces() utf8.c: remove strbuf_write() utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() Shawn O. Pearce (7): run-command: Allow stderr to be a caller supplied pipe send-pack: demultiplex a sideband stream with status data receive-pack: Refactor how capabilities are shown to the client receive-pack: Wrap status reports inside side-band-64k receive-pack: Send hook output over side band #2 t5401: Use a bare repository for the remote peer receive-pack: Send internal errors over side-band #2 Stephen Boyd (1): t7406: Fix submodule init config tests Sylvain Rabot (1): gitweb multiple project roots documentation Tay Ray Chuan (1): transport: add got_remote_refs flag Thomas Rast (1): cherry_pick_list: quit early if one side is empty -- 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 1.7.0.1 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.0.1.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.0.1.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.0.1.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.0.1-1.fc11.$arch.rpm (RPM) Git v1.7.0.1 Release Notes ========================== Fixes since v1.7.0 ------------------ * In a freshly created repository "rev-parse HEAD^0" complained that it is dangling symref, even though "rev-parse HEAD" didn't. * "git show :no-such-name" tried to access the index without bounds check, leading to a potential segfault. * Message from "git cherry-pick" was harder to read and use than necessary when it stopped due to conflicting changes. * We referred to ".git/refs/" throughout the documentation when we meant to talk about abstract notion of "ref namespace". Because people's repositories often have packed refs these days, this was confusing. * "git diff --output=/path/that/cannot/be/written" did not correctly error out. * "git grep -e -pattern-that-begin-with-dash paths..." could not be spelled as "git grep -- -pattern-that-begin-with-dash paths..." which would be a GNU way to use "--" as "end of options". * "git grep" compiled with threading support tried to access an uninitialized mutex on boxes with a single CPU. * "git stash pop -q --index" failed because the unnecessary --index option was propagated to "git stash drop" that is internally run at the end. And other minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.0 are as follows: Bert Wesarg (2): Documentation: mention conflict marker size argument (%L) for merge driver rerere: fix memory leak if rerere images can't be read Evan Powers (1): git-p4: fix bug in symlink handling Jacob Helwig (1): Documentation: Fix indentation problem in git-commit(1) Jeff King (9): accept "git grep -- pattern" cherry-pick: rewrap advice message cherry-pick: refactor commit parsing code cherry-pick: format help message as strbuf cherry-pick: show commit name instead of sha1 cherry-pick: prettify the advice message dwim_ref: fix dangling symref warning docs: don't talk about $GIT_DIR/refs/ everywhere rm: fix bug in recursive subdirectory removal Johannes Sixt (1): t3301-notes: insert a shbang line in ./fake_editor.sh Jonathan Nieder (1): am: remove rebase-apply directory before gc Junio C Hamano (6): Typofixes outside documentation area Start 1.7.0 maintenance track Fix use of mutex in threaded grep Prepare 1.7.0.1 release notes Update 1.7.0.1 release notes Git 1.7.0.1 Larry D'Anna (1): diff: make sure --output=/bad/path is caught Mark Lodato (2): grep documentation: clarify what files match Remove reference to GREP_COLORS from documentation Markus Heidelberg (1): sha1_name: fix segfault caused by invalid index access Matt Kraai (1): commit: quote the user name in the example Pete Harlan (1): Remove hyphen from "git-command" in two error messages René Scharfe (1): fix minor memory leak in get_tree_entry() Stephen Boyd (1): Documentation: describe --thin more accurately Thomas Rast (2): stash pop: remove 'apply' options during 'drop' invocation t1450: fix testcases that were wrongly expecting failure -- 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 feature release Git 1.7.0 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.0.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.0.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.0.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.0-1.fc11.$arch.rpm (RPM) Git v1.7.0 Release Notes ======================== Notes on behaviour change ------------------------- * "git push" into a branch that is currently checked out (i.e. pointed at by HEAD in a repository that is not bare) is refused by default. Similarly, "git push $there :$killed" to delete the branch $killed in a remote repository $there, when $killed branch is the current branch pointed at by its HEAD, will be refused by default. Setting the configuration variables receive.denyCurrentBranch and receive.denyDeleteCurrent to 'ignore' in the receiving repository can be used to override these safety features. * "git send-email" does not make deep threads by default when sending a patch series with more than two messages. All messages will be sent as a reply to the first message, i.e. cover letter. It has been possible already to configure send-email to send "shallow thread" by setting sendemail.chainreplyto configuration variable to false. The only thing this release does is to change the default when you haven't configured that variable. * "git status" is not "git commit --dry-run" anymore. This change does not affect you if you run the command without argument. * "git diff" traditionally treated various "ignore whitespace" options only as a way to filter the patch output. "git diff --exit-code -b" exited with non-zero status even if all changes were about changing the amount of whitespace and nothing else; and "git diff -b" showed the "diff --git" header line for such a change without patch text. In this release, the "ignore whitespaces" options affect the semantics of the diff operation. A change that does not affect anything but whitespaces is reported with zero exit status when run with --exit-code, and there is no "diff --git" header for such a change. * External diff and textconv helpers are now executed using the shell. This makes them consistent with other programs executed by git, and allows you to pass command-line parameters to the helpers. Any helper paths containing spaces or other metacharacters now need to be shell-quoted. The affected helpers are GIT_EXTERNAL_DIFF in the environment, and diff.*.command and diff.*.textconv in the config file. * The --max-pack-size argument to 'git repack', 'git pack-objects', and 'git fast-import' was assuming the provided size to be expressed in MiB, unlike the corresponding config variable and other similar options accepting a size value. It is now expecting a size expressed in bytes, with a possible unit suffix of 'k', 'm', or 'g'. Updates since v1.6.6 -------------------- (subsystems) * "git fast-import" updates; adds "option" and "feature" to detect the mismatch between fast-import and the frontends that produce the input stream. * "git svn" support of subversion "merge tickets" and miscellaneous fixes. * "gitk" and "git gui" translation updates. * "gitweb" updates (code clean-up, load checking etc.) (portability) * Some more MSVC portability patches for msysgit port. * Minimum Pthreads emulation for msysgit port. (performance) * More performance improvement patches for msysgit port. (usability, bells and whistles) * More commands learned "--quiet" and "--[no-]progress" options. * Various commands given by the end user (e.g. diff.type.textconv, and GIT_EDITOR) can be specified with command line arguments. E.g. it is now possible to say "[diff "utf8doc"] textconv = nkf -w". * "sparse checkout" feature allows only part of the work tree to be checked out. * HTTP transfer can use authentication scheme other than basic (i.e./e.g. digest). * Switching from a version of superproject that used to have a submodule to another version of superproject that no longer has it did not remove the submodule directory when it should (namely, when you are not interested in the submodule at all and didn't clone/checkout). * A new attribute conflict-marker-size can be used to change the size of the conflict markers from the default 7; this is useful when tracked contents (e.g. git-merge documentation) have strings that resemble the conflict markers. * A new syntax "@{upstream}" can be used on the command line to substitute the name of the "upstream" of the branch. Missing branch defaults to the current branch, so "git fetch && git merge @{upstream}" will be equivalent to "git pull". * "git am --resolved" has a synonym "git am --continue". * "git branch --set-upstream" can be used to update the (surprise!) upstream, i.e. where the branch is supposed to pull and merge from (or rebase onto). * "git checkout A...B" is a way to detach HEAD at the merge base between A and B. * "git checkout -m path" to reset the work tree file back into the conflicted state works even when you already ran "git add path" and resolved the conflicts. * "git commit --date=''" can be used to override the author date just like "git commit --author=' '" can be used to override the author identity. * "git commit --no-status" can be used to omit the listing of the index and the work tree status in the editor used to prepare the log message. * "git commit" warns a bit more aggressively until you configure user.email, whose default value almost always is not (and fundamentally cannot be) what you want. * "git difftool" has been extended to make it easier to integrate it with gitk. * "git fetch --all" can now be used in place of "git remote update". * "git grep" does not rely on external grep anymore. It can use more than one thread to accelerate the operation. * "git grep" learned "--quiet" option. * "git log" and friends learned "--glob=heads/*" syntax that is a more flexible way to complement "--branches/--tags/--remotes". * "git merge" learned to pass options specific to strategy-backends. E.g. - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree strategy how much to shift the trees explicitly. - "git merge -Xtheirs" can be used to auto-merge as much as possible, while discarding your own changes and taking merged version in conflicted regions. * "git push" learned "git push origin --delete branch", a syntactic sugar for "git push origin :branch". * "git push" learned "git push --set-upstream origin forker:forkee" that lets you configure your "forker" branch to later pull from "forkee" branch at "origin". * "git rebase --onto A...B" means the history is replayed on top of the merge base between A and B. * "git rebase -i" learned new action "fixup" that squashes the change but does not affect existing log message. * "git rebase -i" also learned --autosquash option that is useful together with the new "fixup" action. * "git remote" learned set-url subcommand that updates (surprise!) url for an existing remote nickname. * "git rerere" learned "forget path" subcommand. Together with "git checkout -m path" it will be useful when you recorded a wrong resolution. * Use of "git reset --merge" has become easier when resetting away a conflicted mess left in the work tree. * "git rerere" had rerere.autoupdate configuration but there was no way to countermand it from the command line; --no-rerere-autoupdate option given to "merge", "revert", etc. fixes this. * "git status" learned "-s(hort)" output format. (developers) * The infrastructure to build foreign SCM interface has been updated. * Many more commands are now built-in. * THREADED_DELTA_SEARCH is no more. If you build with threads, delta compression will always take advantage of it. Fixes since v1.6.6 ------------------ All of the fixes in v1.6.6.X maintenance series are included in this release, unless otherwise noted. * "git branch -d branch" used to refuse deleting the branch even when the branch is fully merged to its upstream branch if it is not merged to the current branch. It now deletes it in such a case. * "fiter-branch" command incorrectly said --prune-empty and --filter-commit were incompatible; the latter should be read as --commit-filter. * When using "git status" or asking "git diff" to compare the work tree with something, they used to consider that a checked-out submodule with uncommitted changes is not modified; this could cause people to forget committing these changes in the submodule before committing in the superproject. They now consider such a change as a modification and "git diff" will append a "-dirty" to the work tree side when generating patch output or when used with the --submodule option. -- 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]