Many topics graduated to 'master' and I updated the draft release notes for 1.6.2.
* The 'maint' branch has these fixes since the last announcement.
Clemens Buchacher (1): modify/delete conflict resolution overwrites untracked file
Felipe Contreras (1): fast-import: Cleanup mode setting.
Henrik Austad (2): Use capitalized names where appropriate Be consistent in switch usage for tar
Jay Soffian (1): Git.pm: call Error::Simple() properly
Joey Hess (1): README: tutorial.txt is now called gittutorial.txt
Johannes Schindelin (1): merge-recursive: mark rename/delete conflict as unmerged
Junio C Hamano (3): merge-recursive: do not clobber untracked working tree garbage builtin-apply: prevent non-explicit permission changes git checkout: do not allow switching to a tree-ish that is not a commit
Kirill A. Korinskiy (1): http-push: support full URI in handle_remote_ls_ctx()
Markus Heidelberg (1): doc/git-send-email: mention sendemail.cc config variable
Miklos Vajna (1): fast-export: print usage when no options specified
Pierre Habouzit (1): Avoid spurious error messages on error mistakes.
jidanni@jidanni.org (3): Documentation/git-tag.txt: minor typo and grammar fix Documentation/git-push.txt: minor: compress one option contrib/examples/README: give an explanation of the status of these files
* The 'master' branch has these since the last announcement in addition to the above.
Adeodato Simó (2):
builtin-shortlog.c: use string_list_append(), and don't strdup
unnecessarily
t7501-commit.sh: explicitly check that -F prevents invoking the editorAlexander Potashev (1): remove trailing LF in die() messages
Charles Bailey (4): Fix some tab/space inconsistencies in git-mergetool.sh Add -y/--no-prompt option to mergetool mergetool: Add prompt to continue after failing to merge a file mergetool: Don't keep temporary merge files unless told to
Christian Couder (1): sha1_file: make "read_object" static
Clemens Buchacher (3): unpack-trees: handle failure in verify_absent unpack-trees: fix path search bug in verify_absent unpack-trees: remove redundant path search in verify_absent
Eric Wong (1): git-svn: add --authors-file test
Fabian Emmes (2): cvsserver: add option to configure commit message cvsserver: change generation of CVS author names
Giuseppe Bilotta (1): gitweb: use href() when generating URLs in OPML
Jakub Narebski (3): gitweb: Move 'lineno' id from link to row element in git_blame gitweb: A bit of code cleanup in git_blame() gitweb: cache $parent_commit info in git_blame()
Jeff King (1): Makefile: clean up TEST_PROGRAMS definition
Johannes Schindelin (5): git wrapper: Make while loop more reader-friendly bisect view: call gitk if Cygwin's SESSIONNAME variable is set bundle: allow rev-list options to exclude annotated tags git add: do not add files from a submodule show <tag>: reuse pp_user_info() instead of duplicating code
Jon Loeliger (1): Fix Documentation typos surrounding the word 'handful'.
Junio C Hamano (2): ls-tree: add --full-tree option Update 1.6.2 draft release notes
Kjetil Barvik (1): Cleanup of unused symcache variable inside diff-lib.c
Lee Marlow (2): bash completion: Add '--intent-to-add' long option for 'git add' bash completion: Use 'git add' completions for 'git stage'
Marcel M. Cary (1): git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
Markus Heidelberg (3): git-cherry: make <upstream> parameter optional Documentation: clarify which parameters are optional to git-cherry contrib/vim: change URL to point to the latest syntax files
Matt Kraai (1): gitweb: unify boolean feature subroutines
Miklos Vajna (1): Add support for a pdf version of the user manual
Nanako Shiraishi (1): Document git-ls-tree --full-tree
Nguyễn Thái Ngọc Duy (2): grep: support --no-ext-grep to test builtin grep grep: grep cache entries if they are "assume unchanged"
Nicolas Pitre (1): objects to be pruned immediately don't have to be loosened
Paul Jarc (1): configure clobbers LDFLAGS
Philippe Bruhat (1): Git.pm: correctly handle directory name that evaluates to "false"
Pierre Habouzit (1): filter-branch: add git_commit_non_empty_tree and --prune-empty.
René Scharfe (2): diff: add option to show context between close hunks strbuf: instate cleanup rule in case of non-memory errors
SZEDER Gábor (1): bash: add '--merge' to 'git reset'
William Pursell (2): Add subroutine to display one-line summary of hunks Add 'g' command to go to a hunk