So here is the status for tonight.
* There is no biggie in 'maint' yet.
* On 'master', as I promised, the following topics are merged:
- An option to install p4import, and make it part of the RPM
binary package suite.
- An option to exclude git-gui and gitk.
- Build tweak to include GIT_VERSION string in the documentation.
- Optimize "add single-path" in a huge directory whose
contents are mostly ignored.
- Optimize "rev-list --bisect".
- A handful gitweb, git-svn and git-blame.el cleanups.
In addition, a few patches are also in:
- "diff --stat" to show bytesize changes for binary files.
- "lost-found" to ignore objects only reachable from the reflog.
- "patch -p<n>" is honored even for "diff --git" patches.
- A handful internal clean-ups.
----------------------------------------------------------------
* The 'maint' branch has these fixes since v1.5.1
Brian Gernhardt (1):
Fix t4200-rerere for white-space from "wc -l"
Gerrit Pape (1):
rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
Junio C Hamano (1):
rerere: make sorting really stable.
* The 'master' branch has these since v1.5.1 in addition to the above.
Andy Parkins (1):
Show binary file size change in diff --stat
Brian Gernhardt (1):
Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
Eric Wong (1):
git-svn: bail out on incorrect command-line options
Eygene Ryabinkin (7):
Add the WITH_P4IMPORT knob to the Makefile.
Added git-p4 package to the list of git RPMs.
Added correct Python path to the RPM specfile.
NO_TCLTK
Add --with-tcltk and --without-tcltk to configure.
Rewrite Tcl/Tk interpreter path for the GUI tools.
Eliminate checks of user-specified Tcl/Tk interpreter.
Frank Lichtenheld (2):
Documentation: Replace @@GIT_VERSION@@ in documentation
Documentation: Add version information to man pages
Jakub Narebski (2):
gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)
gitweb: Quote hash keys, and do not use barewords keys
Junio C Hamano (14):
t6002: minor spelling fix.
git-rev-list: add --bisect-vars option.
git-rev-list --bisect: optimization
t6004: add a bit more path optimization test.
rev-list --bisect: Fix "halfway" optimization.
make the previous optimization work also on path-limited rev-list --bisect
Documentation: unbreak user-manual.
Optional Tck/Tk: ignore generated files.
RPM spec: include git-p4 in the list of all packages.
Fix bogus error message from merge-recursive error path
Propagate cache error internal to refresh_cache() via parameter.
Rename internal function "add_file_to_cache" in builtin-update-index.c
Rename static variable write_index to update_index in builtin-apply.c
Rename add_file_to_index() to add_file_to_cache()
Linus Torvalds (1):
Optimize directory listing with pathspec limiter.
Nicolas Pitre (1):
clean up and optimize nth_packed_object_sha1() usage
Shawn O. Pearce (2):
Fix lost-found to show commits only referenced by reflogs
Honor -p<n> when applying git diffs
Xavier Maillard (2):
git-blame.el: separate git-blame-mode to ease maintenance
git-blame.el: pick a set of random colors for each git-blame turn
-
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