Maybe will do 1.5.1.1 on Wednesday with the accumulated fixes on
'maint'.
The 'master' has a few topics merged from 'next':
- Christian Couder's "git bisect" improvements.
- Fernando J Perada's parallel make fix.
- Andy Parkins's "git diff --stat" for binary files.
- Shawn Pearce's "git lost-found" that ignores reflog.
- Switching between two branches that have D/F conflicts.
- "git merge -s subtree".
----------------------------------------------------------------
* The 'maint' branch has these fixes since the last announcement.
Arjen Laarhoven (4):
usermanual.txt: some capitalization nits
t3200-branch.sh: small language nit
t5300-pack-object.sh: portability issue using /usr/bin/stat
Makefile: iconv() on Darwin has the old interface
Brian Gernhardt (2):
Document --left-right option to rev-list.
Distinguish branches by more than case in tests.
Dana How (1):
Fix lseek(2) calls with args 2 and 3 swapped
Eric Wong (3):
git-svn: bail out on incorrect command-line options
git-svn: dcommit/rebase confused by patches with git-svn-id: lines
git-svn: fix log command to avoid infinite loop on long commit messages
Frank Lichtenheld (6):
cvsimport: sync usage lines with existing options
cvsimport: Improve documentation of CVSROOT and CVS module determination
cvsimport: Improve usage error reporting
cvsimport: Reorder options in documentation for better understanding
cvsimport: Improve formating consistency
cvsserver: small corrections to asciidoc documentation
Geert Bosch (1):
Fix renaming branch without config file
Jakub Narebski (1):
gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
Junio C Hamano (3):
Fix dependency of common-cmds.h
Documentation: tighten dependency for git.{html,txt}
Add Documentation/cmd-list.made to .gitignore
Lars Hjemli (2):
rename_ref(): only print a warning when config-file update fails
Make builtin-branch.c handle the git config file
René Scharfe (1):
Revert "builtin-archive: use RUN_SETUP"
Shawn O. Pearce (1):
Honor -p<n> when applying git diffs
Ville Skyttä (1):
DESTDIR support for git/contrib/emacs
YOSHIFUJI Hideaki (1):
Avoid composing too long "References" header.
* The 'master' branch has these since the last announcement
in addition to the above.
Alex Riesen (1):
Fix passing of TCLTK_PATH to git-gui
Andy Parkins (1):
Show binary file size change in diff --stat
Christian Couder (2):
Bisect: teach "bisect start" to optionally use one bad and many good revs.
Documentation: bisect: "start" accepts one bad and many good commits
Fernando J. Pereda (1):
Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
Junio C Hamano (21):
git-fetch: add --quiet
checkout: allow detaching to HEAD even when switching to the tip of a branch
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
git-read-tree --index-output=<file>
add_cache_entry(): removal of file foo does not conflict with foo/bar
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
unpack-trees: get rid of *indpos parameter.
Fix read-tree --prefix=dir/.
Fix twoway_merge that passed d/f conflict marker to merged_entry().
Fix switching to a branch with D/F when current branch has file D.
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()
git-bisect: modernization
t6030: add a bit more tests to git-bisect
git-bisect: allow bisecting with only one bad commit.
git-push reports the URL after failing.
git-push to multiple locations does not stop at the first failure
A new merge stragety 'subtree'.
Nicolas Pitre (1):
clean up and optimize nth_packed_object_sha1() usage
Shawn O. Pearce (1):
Fix lost-found to show commits only referenced by reflogs
-
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