I've pushed out 1.5.6-rc3 to kernel.org. Nothing majorly disrupting nor scary here.
--
Ask Bjørn Hansen (2):
gitweb setup instruction: rewrite HEAD and root as well
send-email: Allow the envelope sender to be set via configurationAvery Pennarun (2):
git-svn: don't append extra newlines at the end of commit messages.
git-svn: test that extra blank lines aren't inserted in commit messages.Boyd Lynn Gerber (2):
progress.c: avoid use of dynamic-sized array
Port to 12 other Platforms.Chris Ridd (1):
Improve sed portabilityChristian Couder (1):
documentation: bisect: remove bits talking about a bisection branchFlavio Poletti (1):
git-instaweb: improve auto-discovery of httpd and call conventions.Fred Maranhão (1):
fix typo in tutorialGeoffrey Irving (1):
doc: adding gitman.info and *.texi to .gitignoreJakub Narebski (2):
gitweb: Make it work with $GIT containing spaces
Use 'trash directory' thoroughly in t/test-lib.shJeff King (1):
document --pretty=tformat: optionJohannes Schindelin (1):
merge-recursive: respect core.autocrlf when writing out the resultJohannes Sixt (2):
make_nonrelative_path: Use is_absolute_path()
Remove exec bit from builtin-fast-export.cJunio C Hamano (8):
http-push.c: remove duplicated code
"remote prune": be quiet when there is nothing to prune
Documentation/git-pull.txt: Use more standard [NOTE] markup
Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output
user-manual: describe how higher stages are set during a merge
t4126: fix test that happened to work due to timing
sha1_file.c: dead code removal
GIT 1.5.6-rc3Lea Wiemann (4):
t1006-cat-file.sh: typo
cat-file --batch / --batch-check: do not exit if hashes are missing
Documentation/git-cat-file.txt: add missing line break
t/.gitattributes: only ignore whitespace errors in test filesLinus Torvalds (4):
Consolidate SHA1 object file close
Avoid cross-directory renames and linking on object creation
Make loose object file reading more careful
Simplify and rename find_sha1_file()Marius Storm-Olsen (1):
Add testcase for merging in a CRLF repoMark Levedahl (1):
git-submodule - Fix errors regarding resolve_relative_urlMikael Magnusson (1):
Typo in RelNotes.Mike Hommey (1):
Don't allocate too much memory in quote_ref_urlMiklos Vajna (3):
Remove unused code in parse_commit_buffer()
git-rebase -i: mention the short command aliases in the todo list
git-read-tree: document -v option.Olivier Marin (4):
remote show: fix the -n option
builtin-remote: split show_or_prune() in two separate functions
remote prune: print the list of pruned branches
remote show: list tracked remote branches with -nPaul Mackerras (1):
gitk: Handle detached heads betterPhilippe Bruhat (BooK) (1):
git-cvsimport: do not fail when CVSROOT is /Pieter de Bie (1):
git-send-email: allow whitespace in addressee listRené Scharfe (1):
Ignore .gitattributes in bare repositoriesSZEDER Gábor (2):
git add: add long equivalents of '-u' and '-f' options
completion: add more 'git add' optionsShawn O. Pearce (1):
fast-export: Correctly generate initial commits with no parentsStephan Beyer (6):
git-commit.txt: Correct option alternatives
git-commit.txt: Add missing long/short options
Docs: Use "-l::\n--long\n" format in OPTIONS sections
Docs: add some long/short options
git-describe.txt: document --always
git-name-rev.txt: document --no-undefined and --always