What's new in GIT today
- From
Junio C Hamano <junkio@cox.net>
- Date
- Oct 4, 2005, 02:20 UTC
- Message-ID
- <7virwehvkq.fsf@assigned-by-dhcp.cox.net>
GIT 0.99.8a is found in the usual places. It contains the following fixes:
- Documentation formatting updates, by Jonas Fonseca.
- Fredrik Kuivinen fixed git-merge to stash away the original tree state correctly when using more than one merge strategy. The same commit also adds support for baseless merges.
- 'git repack' can get confused if the tree had a funny filename.
- Specifying object name with just a short SHA1 prefix sort-of worked, but did not do the right thing when ambiguities existed between packed and unpacked objects; after thinking about it more, I realize that the fixed code still misses some ambiguities, but it is a bit better than before.
On the "master" branch front:
- All of the above, plus the missing fix for SHA1 prefix uniqueness check (to be included in 0.99.8b).
- Cygwin port by H. Peter Anvin.
- Option parsing in 'git pull' was buggy and could not recognize the following sequence:
$ git fetch http://kernel.org/pub/scm/git/git-cygwin.git/ $ git pull -a . fixes pull
to fetch a remote and use that head along with two other local heads to create a four-head Octopus.