The largest change to 'master' in this round is Linus's case insensitivity
changes. I wanted to get feedback and fixes (if needed) from case
insensitive folks while the topic was still in 'next', but it did not
happen, but this should at least not harm sane filesystems, so let's see
how it goes.
----------------------------------------------------------------
* The 'maint' branch has these fixes since the last announcement.
A Large Angry SCM (1):
git-repack: re-enable parsing of -n command line option
Dustin Sallings (1):
Documentation/config.txt: Mention branch.<name>.rebase applies to "git
pull"
Ian Hilt (1):
Documentation/git-describe.txt: make description more readable
Jeff King (1):
doc: clarify definition of "update" for git-add -u
Johannes Sixt (1):
wt-status.h: declare global variables as extern
Sitaram Chamarty (1):
builtin-commit.c: add -u as short name for --untracked-files
* The 'master' branch has these since the last announcement
in addition to the above.
Alex Riesen (1):
Improve reporting of errors in config file routines
Brandon Casey (1):
compat/fopen.c: avoid clobbering the system defined fopen macro
Bryan Donlan (10):
git-rebase.sh: Fix --merge --abort failures when path contains whitespace
config.c: Escape backslashes in section names properly
git-send-email.perl: Handle shell metacharacters in $EDITOR properly
test-lib.sh: Add a test_set_editor function to safely set $VISUAL
Use test_set_editor in t9001-send-email.sh
test-lib.sh: Fix some missing path quoting
lib-git-svn.sh: Fix quoting issues with paths containing shell
metacharacters
Don't use the 'export NAME=value' in the test scripts.
Fix tests breaking when checkout path contains shell metacharacters
Rename the test trash directory to contain spaces.
Caio Marcelo de Oliveira Filho (1):
git-format-patch: add --no-binary to omit binary changes in the patch.
Christian Couder (12):
help: use man viewer path from "man.<tool>.path" config var
documentation: help: add "man.<tool>.path" config variable
help: use "man.<tool>.cmd" as custom man viewer command
documentation: help: add info about "man.<tool>.cmd" config var
documentation: web--browse: add a note about konqueror
Documentation: rename "hooks.txt" to "githooks.txt" and make it a man
page
Documentation: improve "add", "pull" and "format-patch" examples
Documentation: bisect: add a few "git bisect run" examples
bisect: print an error message when "git rev-list --bisect-vars" fails
rev-parse: add test script for "--verify"
rev-parse: fix using "--default" with "--verify"
rev-parse --verify: do not output anything on error
Dan McGee (1):
Allow cherry-pick (and revert) to add signoff line
Daniel Barkalow (2):
Make walker.fetch_ref() take a struct ref.
Make ls-remote http://... list HEAD, like for git://...
Dustin Sallings (1):
Allow tracking branches to set up rebase by default.
Eric Wong (1):
git-svn: fix cloning of HTTP URLs with '+' in their path
Gerrit Pape (1):
git-bisect.sh: don't accidentally override existing branch "bisect"
Gustaf Hendeby (1):
Documentation/config.txt: Add git-gui options
Jakub Narebski (1):
gitweb: Use feed link according to current view
Jeff King (7):
add merge.renamelimit config option
bump rename limit defaults
diff: make "too many files" rename warning optional
fix bsd shell negation
t5000: tar portability fix
clone: bsd shell portability fix
filter-branch: fix variable export logic
Johannes Sixt (1):
compat-util: avoid macro redefinition warning
Junio C Hamano (3):
diff: a submodule not checked out is not modified
diff-lib.c: rename check_work_tree_entity()
is_racy_timestamp(): do not check timestamp for gitlinks
Krzysztof Kowalczyk (1):
alloc_ref_from_str(): factor out a common pattern of alloc_ref from
string
Linus Torvalds (12):
Make unpack_trees_options bit flags actual bitfields
Move name hashing functions into a file of its own
Make "index_name_exists()" return the cache_entry it found
Make hash_name_lookup able to do case-independent lookups
Add 'core.ignorecase' option
Make branch merging aware of underlying case-insensitive filsystems
Make unpack-tree update removed files before any updated files
When adding files to the index, add support for case-independent matches
Make git-add behave more sensibly in a case-insensitive environment
Optimize match_pathspec() to avoid fnmatch()
Avoid some unnecessary lstat() calls
Optimize symlink/directory detection
Mark Hills (1):
Be more careful with objects directory permissions on clone
Miklos Vajna (3):
git-format-patch: add a new format.cc configuration variable
git-send-email: add a new sendemail.cc configuration variable
Add tests for sendemail.cc configuration variable
Ping Yin (2):
t4027: test diff for submodule with empty directory
Add t7506 to test submodule related functions for git-status
SZEDER Gábor (5):
doc: moved merge.* config variables into separate merge-config.txt
merge, pull: introduce '--(no-)stat' option
add 'merge.stat' config variable
fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
merge, pull: add '--(no-)log' command line option
Santi Béjar (3):
Preparation to call determine_author_info from prepare_to_commit
commit: Show author if different from committer
commit: Show committer if automatic
Sebastian Schuberth (1):
mergetool: Make ECMerge use the settings as specified by the user in the
GUI
Steven Grimm (1):
Add svn-compatible "blame" output format to git-svn
--
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
