Skip to contentSkip to conversation

GIT 0.99.9f

PATCH New Junio C Hamano 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

This is more like a "current snapshot" rather than "contains important fixes -- please update".

Much of the changes are documentation fixes, but there are two new toys to play with.

- git-push is now aware of push over DAV (Nick)
- git-cvs suite has 'exportcommit' to play git commits back at CVS (Martin).

---

Alex Riesen:
ls-files and read-tree need core.filemode

Fredrik Kuivinen:
merge-recursive: Only print relevant rename messages

Johannes Schindelin:
Small bugfixes for http-push.c

Jon Loeliger:
Refactored merge options into separate merge-options.txt. Add bug isolation howto, scraped from Linus. Add --tags documentation, scraped from JC mail. Use consistent shell prompts and example style.

Junio C Hamano:
Documentation: talk about guts of merge in tutorial. Recover dropped +x bit from git-pull.sh by accident.
Do not fail on hierarchical tagnames.
Documentation: asciidoc formatting fix for git-cvsexportcommit doc. Fix documentation dependency generation.
Ignore more generated files.
Documentation: fix dependency generation.
Tutorial: do not use 'git resolve'.
Debian: packaging updates.
git-am: do not lose already edited final-commit when resuming. GIT 0.99.9f

Kai Ruemmler:
Documentation update: use git branch -d foo where applicable

Martin Langhoff:
Introducing: git-cvsexportcommit

Nick Hengeveld:
Make http-push smarter about creating remote dirs Add support for git-http-push to git-push script

#1 lore raw

PATCH 1/1 fix cvsexportcommit syntax error

There is a syntax error in cvsexport script:

git-cvsexportcommit.perl 2005-11-09 13:00:57.000000000 +0600 renamed from git-cvsexportcommit.perl.orig 2005-11-09 13:00:51.000000000 +0600 +1 -1
@@ -64,7 +64,7 @@
            last;
        }; # found it
        die "Did not find $parent in the parents for this commit!";
-s    }
+    }
 } else { # we don't have a parent from the cmdline...
     if (@parents == 1) { # it's safe to get it from the commit
        $parent = $parents[0];