Package: git-core Version: 1:1.7.0-1 Severity: minor Tags: patch Hi Gerrit,
Git version 1.7.0.1 was released yesterday, so I pulled it. Nothing urgent-looking, but still it is nice to have. Perhaps the result could save you some trouble. The following changes since commit bb96cd75481cd3048f15638424852f88e8e66795: * new upstream release. * Documentation: Update git core tutorial clarifying reference to scripts (closes: ##560795). * merge branch debian-experimental. (2010-02-16 09:11:51 +0000) are available in the git repository at: git://repo.or.cz/debian-git/jrn sid 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 (3): am: remove rebase-apply directory before gc Merge commit 'v1.7.0.1' into debian-sid * new upstream point release. Junio C Hamano (16): Typofixes outside documentation area Start 1.7.0 maintenance track Merge branch 'maint-1.6.6' into maint Merge branch 'maint-1.6.5' into maint-1.6.6 Merge branch 'maint-1.6.6' into maint Fix use of mutex in threaded grep Merge branch 'jc/maint-grep-one-thread-mutex-fix' into maint Prepare 1.7.0.1 release notes Merge branch 'jc/typo' into maint Merge branch 'jk/grep-double-dash' into maint Merge branch 'jk/cherry-pick-reword' into maint Update 1.7.0.1 release notes Merge branch 'jk/maint-rmdir-fix' into maint Merge branch 'ml/maint-grep-doc' into maint Merge branch 'maint-1.6.6' into maint 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 Documentation/RelNotes-1.7.0.1.txt | 35 +++++++++++ Documentation/config.txt | 4 +- Documentation/git-check-ref-format.txt | 5 +- Documentation/git-clone.txt | 2 +- Documentation/git-commit.txt | 6 +- Documentation/git-fetch-pack.txt | 6 +- Documentation/git-grep.txt | 17 ++++-- Documentation/git-index-pack.txt | 12 +--- Documentation/git-pack-objects.txt | 39 ++++++++---- Documentation/git-prune.txt | 2 +- Documentation/git-push.txt | 13 ++-- Documentation/git-rev-parse.txt | 22 ++++--- Documentation/git-send-pack.txt | 4 +- Documentation/git-show-branch.txt | 10 ++-- Documentation/git-stash.txt | 2 +- Documentation/git.txt | 3 +- Documentation/gitattributes.txt | 3 +- Documentation/rev-list-options.txt | 22 +++--- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- builtin-apply.c | 2 +- builtin-cat-file.c | 5 +- builtin-commit.c | 2 +- builtin-grep.c | 35 ++++++++--- builtin-log.c | 2 +- builtin-prune.c | 2 +- builtin-revert.c | 42 ++++++------- builtin-show-branch.c | 2 +- compat/win32/pthread.c | 2 +- connect.c | 2 +- contrib/fast-import/git-p4 | 5 +- contrib/fast-import/import-directories.perl | 2 +- daemon.c | 2 +- debian/changelog | 8 +++ debian/changelog.upstream | 65 ++++++++++++++++++++ ...check-etc-mailname-if-author-email-is-unkn.diff | 6 +- ...hooks-post-receive-email-set-encoding-to-u.diff | 6 +- debian/versions.upstream | 1 + diff.c | 4 +- dir.c | 2 +- git-am.sh | 3 +- git-stash.sh | 7 ++- git.c | 2 +- help.c | 2 +- levenshtein.h | 2 +- path.c | 2 +- perl/Git.pm | 4 +- refs.c | 2 +- rerere.c | 9 ++- setup.c | 2 +- sha1_name.c | 35 ++++++----- t/t1450-fsck.sh | 16 +++--- t/t3301-notes.sh | 1 + t/t3600-rm.sh | 8 +++ t/t3903-stash.sh | 9 +++ t/t7002-grep.sh | 33 ++++++++++ test-chmtime.c | 2 +- transport-helper.c | 2 +- tree-walk.c | 1 + 59 files changed, 376 insertions(+), 174 deletions(-) create mode 100644 Documentation/RelNotes-1.7.0.1.txt -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org