I'll hopefully soon apply the RPM spec patch from Kristian
Høgsberg to 'maint' and cut 1.5.4.2. It will have bunch of
config parser related fixes among others.
On the 'master' front, a handful topics have graduated:
- Brian Downing's compat/qsort;
- Crhstian Couder's browser wrapper;
- Paolo Bonzini's prepare-commit-msg hook;
- Steffen Prohaska's safe-crlf;
- "foo/" in .gitignore matches directory "foo".
Also, updated versions of gitk and git-gui are included.
Have fun.
----------------------------------------------------------------
* The 'maint' branch has these fixes since the last announcement.
Christian Couder (8):
config: add test cases for empty value and no value config variables.
diff.c: replace a 'strdup' with 'xstrdup'.
diff.c: remove useless check for value != NULL
config: add 'git_config_string' to refactor string config variables.
Add "const" qualifier to "char *pager_program".
Add "const" qualifier to "char *editor_program".
Add "const" qualifier to "char *excludes_file".
diff.c: add "const" qualifier to "char *cmd" member of "struct
ll_diff_driver"
Daniel Barkalow (1):
Validate nicknames of remote branches to prohibit confusing ones
Gerrit Pape (1):
cvsimport: have default merge regex also match beginning of commit
message
Jay Soffian (1):
mailinfo: feed only one line to handle_filter() for QP input
Jeff King (2):
status: suggest "git rm --cached" to unstage for initial commit
commit: discard index after setting up partial commit
Johannes Schindelin (1):
bisect: use verbatim commit subject in the bisect log
Johannes Sixt (1):
upload-pack: Initialize the exec-path.
Junio C Hamano (6):
Revert "pack-objects: only throw away data during memory pressure"
Protect get_author_ident_from_commit() from filenames in work tree
diff.c: fixup garding of config parser from value=NULL
diff: Fix miscounting of --check output
filter-branch: handle filenames that need quoting
Documentation/git-reset:
Miklos Vajna (1):
git clone -s documentation: force a new paragraph for the NOTE
Pieter de Bie (2):
Documentation/git-reset: don't mention --mixed for selected-paths reset
Documentation/git-reset: Add an example of resetting selected paths
Sergei Organov (1):
git-cvsimport.txt: fix '-M' description.
Shawn O. Pearce (1):
fast-import: check return value from unpack_entry()
Stelian Pop (1):
hg-to-git: fix parent analysis
----------------------------------------------------------------
* The 'master' branch has these since the last announcement
in addition to the above.
Brian Downing (1):
compat: Add simplified merge sort implementation from glibc
Christian Couder (7):
help: make 'git-help--browse' usable outside 'git-help'.
help--browse: add '--config' option to check a config option for a
browser.
Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
instaweb: use 'git-web--browse' to launch browser.
Documentation: instaweb: add 'git-web--browse' information.
web--browse: Add a few quotes in 'init_browser_path'.
Documentation: add 'git-web--browse.txt' and simplify other docs.
Christian Stimming (2):
git-gui: (i18n) Fix a bunch of still untranslated strings.
git-gui: Update German translation.
Dmitry Potapov (1):
git-web--browse: do not start the browser with nohup
Gerrit Pape (1):
gitk: properly deal with tag names containing / (slash)
Jay Soffian (3):
git-gui: support Git Gui.app under OS X 10.5
git-help--browse: improve browser support under OS X
git-web--browse: fix misplaced quote in init_browser_path()
Jeff King (2):
allow suppressing of global and system config
fix config reading in tests
Johan Herland (2):
Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative
$GIT_DIR
Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
Johannes Schindelin (1):
Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)
Johannes Sixt (1):
gitk: Heed the lines of context in merge commits
Junio C Hamano (7):
Documentation/SubmittingPatches: Instruct how to use [PATCH] Subject
header
Documentation/SubmittingPatches: discuss first then submit
Documentation/SubmittingPatches: What's Acked-by and Tested-by?
gitignore(5): Allow "foo/" in ignore list to match directory "foo"
gitignore: lazily find dtype
.mailmap: adjust to a recent patch application glitch.
Documentation/SubmittingPatches - a suggested patch flow
Linus Torvalds (1):
gitk: learn --show-all output
Michele Ballabio (1):
gitk: Fix "Key bindings" message
Paolo Bonzini (4):
git-commit: support variable number of hook arguments
git-commit: set GIT_EDITOR=: if editor will not be launched
git-commit: Refactor creation of log message.
git-commit: add a prepare-commit-msg hook
Shawn O. Pearce (7):
git-gui: Automatically spell check commit messages as the user types
git-gui: Paper bag fix bad string length call in spellchecker
git-gui: Correct size of dictionary name widget in options dialog
Include annotated tags in fast-import crash reports
Include the fast-import marks table in crash reports
Finish current packfile during fast-import crash handler
Update fast-import documentation to discuss crash reports
Steffen Prohaska (2):
safecrlf: Add mechanism to warn about irreversible crlf conversions
gitk: Add checkbutton to ignore space changes
-
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
