Config parser fixes are in 'maint', along with many other
minor fixes.
As promised, a handful topics that have been cooking in 'next'
have graduated to 'master'.
----------------------------------------------------------------
* The 'maint' branch has these fixes since v1.5.4.1
David Steven Tweed (1):
Make git prune remove temporary packs that look like write failures
Frank Lichtenheld (1):
config: Fix --unset for continuation lines
Gerrit Pape (1):
builtin-commit: remove .git/SQUASH_MSG upon successful commit
James Bowes (1):
Add a BuildRequires for gettext in the spec file.
Johannes Schindelin (2):
bisect: allow starting with a detached HEAD
Document that the default of branch.autosetupmerge is true
Jonas Fonseca (1):
man pages are littered with .ft C and others
Junio C Hamano (24):
git-pull documentation: fix markup
archive-tar.c: guard config parser from value=NULL
Add config_error_nonbool() helper function
builtin-apply.c: guard config parser from value=NULL
builtin-branch.c: guard config parser from value=NULL
builtin-commit.c: guard config parser from value=NULL
builtin-config.c: guard config parser from value=NULL
builtin-log.c: guard config parser from value=NULL
builtin-reflog.c: guard config parser from value=NULL
builtin-show-branch.c: guard config parser from value=NULL
builtin-tag.c: guard config parser from value=NULL
connect.c: guard config parser from value=NULL
convert.c: guard config parser from value=NULL
diff.c: guard config parser from value=NULL
git.c: guard config parser from value=NULL
help.c: guard config parser from value=NULL
http.c: guard config parser from value=NULL
merge-recursive.c: guard config parser from value=NULL
remote.c: guard config parser from value=NULL
setup.c: guard config parser from value=NULL
wt-status.c: guard config parser from value=NULL
imap-send.c: guard config parser from value=NULL
builtin-log.c: guard config parser from value=NULL
config.c: guard config parser from value=NULL
Martin Koegler (1):
pack-objects: only throw away data during memory pressure
Mike Hommey (1):
Work around curl-gnutls not liking to be reinitialized
Miklos Vajna (1):
builtin-gc.c: guard config parser from value=NULL
Uwe Kleine-König (1):
rebase -i: accept -m as advertised in the man page
* The 'master' branch has these since v1.5.4 in addition to the
above.
Alexandre Julliard (4):
git.el: Support for showing unknown/ignored directories.
git.el: Added a command to amend a commit.
git.el: Check for existing buffers on revert.
git.el: Better handling of subprocess errors.
Bruno Ribas (1):
gitweb: Make use of the $git_dir variable at sub git_get_project_url_list
Christian Couder (1):
config: add test cases for empty value and no value config variables.
Daniel Barkalow (2):
Test :/string form for checkout
Reduce the number of connects when fetching
David Brown (1):
git-send-email: Generalize auto-cc recipient mechanism.
Eric Wong (1):
git-svn: improve repository URL matching when following parents
Florian La Roche (1):
gitweb: Make feed entries point to commitdiff view
James Bowes (1):
Add a BuildRequires for gettext in the spec file.
Jason McMullan (1):
Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import
Johannes Schindelin (3):
Also use unpack_trees() in do_diff_cache()
Fix "git clone" for git:// protocol
Introduce the config variable pack.packSizeLimit
Johannes Sixt (1):
Fix misuse of prefix_path()
Jonas Fonseca (1):
man pages are littered with .ft C and others
Junichi Uekawa (1):
git-blame.el: show the when, who and what in the minibuffer.
Junio C Hamano (12):
index: be careful when handling long names
Avoid running lstat(2) on the same cache entry.
read-cache.c: fix a couple more CE_REMOVE conversion
read-cache.c: introduce is_racy_timestamp() helper
lazy index hashing
Sane use of test_expect_failure
test: reword the final message of tests with known breakages
known breakage: revision range computation with clock skew
fix misuse of prefix_path()
Make error messages from cherry-pick/revert more sensible
Define the project whitespace policy
Update the main documentation (stale notes section)
Karl Hasselström (2):
git-svn: Don't call git-repack anymore
Let "git svn" run "git gc --auto" occasionally
Linus Torvalds (3):
Make on-disk index representation separate from in-core one
Make run_diff_index() use unpack_trees(), not read_tree()
Create pathname-based hash-table lookup into index
Martin Koegler (2):
git-fsck: report missing author/commit line in a commit as an error
parse_object_buffer: don't ignore errors from the object specific parsing
functions
Michael Witten (3):
git-send-email: ssh/login style password requests
git-send-email: SIG{TERM,INT} handlers
git-send-email: Better handling of EOF
Mike Hommey (1):
Work around curl-gnutls not liking to be reinitialized
Pierre Habouzit (2):
git-describe: Add a --match option to limit considered tags.
git-name-rev: add a --(no-)undefined option.
Rafael Garcia-Suarez (1):
Make git-remote.perl "use strict" compliant
Robin Rosenberg (1):
Improve bash prompt to detect various states like an unfinished merge
Simon Hausmann (2):
git-p4: Fix submit user-interface.
git-p4: Ensure the working directory and the index are clean before
"git-p4 rebase"
Tim Stoakes (1):
Add `git svn blame' command
Toby Allsopp (1):
git-p4: Fix indentation from tab to spaces
Tommy Thorn (1):
git-p4: Fix an obvious typo
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
