From: Junio C Hamano Date: Sun, 21 Feb 2010 23:57:28 +0000 (-0800) Subject: What's cooking (2010/02 #5) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e438aebb42595eef643d90161f08a621da8a498;p=thirdparty%2Fgit.git What's cooking (2010/02 #5) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 97689987f9..2e9aa61b34 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Feb 2010, #04; Wed, 17) -X-master-at: 1df48766137f2040e2e992d7d278d5aca26406cf -X-next-at: 3b7be804f698c39d8f538d9996786b41c08b7181 +Subject: What's cooking in git.git (Feb 2010, #05; Sun, 21) +X-master-at: 241b9254e1c8ff071d8054f8b6fbe1883b389d69 +X-next-at: d52c051f421da80f7dc5fed68a7046d70d06d008 -What's cooking in git.git (Feb 2010, #04; Wed, 17) +What's cooking in git.git (Feb 2010, #05; Sun, 21) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -14,116 +14,152 @@ still holding onto them. -------------------------------------------------- [Graduated to "master"] -* jk/cherry-pick-reword (2010-02-11) 5 commits - (merged to 'next' on 2010-02-11 at d0eace1) - + cherry-pick: prettify the advice message - + cherry-pick: show commit name instead of sha1 - + cherry-pick: format help message as strbuf - + cherry-pick: refactor commit parsing code - + cherry-pick: rewrap advice message +* np/fast-import-idx-v2 (2010-02-17) 6 commits + + fast-import: use the diff_delta() max_delta_size argument + + fast-import: honor pack.indexversion and pack.packsizelimit config vars + + fast-import: make default pack size unlimited + + fast-import: use write_idx_file() instead of custom code + + fast-import: use sha1write() for pack data + + fast-import: start using struct pack_idx_entry -* rs/git-dir-cleanup (2010-02-11) 3 commits - (merged to 'next' on 2010-02-11 at fa4f83c) - + Untouch RelNotes 1.7.0: grep --no-index will not be in the release - (merged to 'next' on 2010-02-06 at ef8ab9b) - + Resurrect "git grep --no-index" - + setenv(GIT_DIR) clean-up +* ml/maint-grep-doc (2010-02-15) 1 commit + (merged to 'next' on 2010-02-16 at 4059a38) + + grep documentation: clarify what files match -* jk/grep-double-dash (2010-02-06) 1 commit - (merged to 'next' on 2010-02-07 at 2ac040d) - + accept "git grep -- pattern" +* tc/maint-transport-ls-remote-with-void (2010-02-16) 1 commit + (merged to 'next' on 2010-02-16 at e6ef1a8) + + transport: add got_remote_refs flag -* jc/typo (2010-02-03) 1 commit - + Typofixes outside documentation area +* hm/maint-imap-send-crlf (2010-02-12) 1 commit + (merged to 'next' on 2010-02-17 at c6162cb) + + git-imap-send: Convert LF to CRLF before storing patch to draft box --------------------------------------------------- -[New Topics] +* sp/maint-push-sideband (2010-02-10) 8 commits + (merged to 'next' on 2010-02-16 at 6f19e5b) + + receive-pack: Send internal errors over side-band #2 + + t5401: Use a bare repository for the remote peer + + receive-pack: Send hook output over side band #2 + + receive-pack: Wrap status reports inside side-band-64k + + receive-pack: Refactor how capabilities are shown to the client + + send-pack: demultiplex a sideband stream with status data + + run-command: support custom fd-set in async + + run-command: Allow stderr to be a caller supplied pipe + (this branch is used by sp/push-sideband.) -* dp/maint-1.6.3-hash-sans-mmap (2010-02-14) 1 commit - - don't use mmap() to hash files +Based on 1.6.5 maintenance track, later to be merged to 1.6.X maintenance +series if needed. -This was more of an RFC in that slurping a potentially huge file into -memory without using mmap() was conceptually wrong. I suspect somebody -is cooking a patch to hash and compress a large blob in chunks straight -into a packfile as a replacement ;-). +* sp/push-sideband (2010-02-10) 0 commits + (this branch uses sp/maint-push-sideband.) -* jc/for-each-ref (2010-02-13) 4 commits - - for-each-ref --format='%(flag)' - - for-each-ref --format='%(symref) %(symref:short)' - - builtin-for-each-ref.c: check if we need to peel onion while parsing the format - - builtin-for-each-ref.c: comment fixes +* jc/checkout-detached (2010-01-29) 1 commit + (merged to 'next' on 2010-02-17 at 7e03edc) + + Reword "detached HEAD" notification -Should be Ok for 'next'. +* jc/maint-fix-test-perm (2010-01-30) 2 commits + (merged to 'next' on 2010-02-16 at 9d2e037) + + lib-patch-mode.sh: Fix permission + + t6000lib: Fix permission -* jn/gitweb-config-error-die (2010-02-14) 1 commit - - gitweb: Die if there are parsing errors in config file +* jn/makefile-script-lib (2010-01-31) 1 commit + (merged to 'next' on 2010-02-16 at f5334f5) + + Do not install shell libraries executable -Should be Ok for 'next'. +* mv/request-pull-modernize (2010-01-29) 1 commit + (merged to 'next' on 2010-02-16 at be03aad) + + request-pull: avoid mentioning that the start point is a single commit -* jn/maint-fix-pager (2010-02-14) 6 commits - - tests: Add tests for automatic use of pager - - am: Fix launching of pager - - git svn: Fix launching of pager - - git.1: Clarify the behavior of the --paginate option - - Make 'git var GIT_PAGER' always print the configured pager - - Fix 'git var' usage synopsis +-------------------------------------------------- +[New Topics] -Should be Ok for 'next'. +* dp/read-not-mmap-small-loose-object (2010-02-21) 1 commit + - hash-object: don't use mmap() for small files -* ml/color-when (2010-02-16) 1 commit - - Add an optional argument for --color options +I treaked the cut-off based on my reading of Dmitry's numbers. -* hm/imap-send-cram-md5 (2010-02-15) 1 commit - - imap-send: support CRAM-MD5 authentication +* np/compress-loose-object-memsave (2010-02-20) 1 commit + . sha1_file: don't malloc the whole compressed result when writing out objects -A potential clean-up sent as a counter-proposal; waiting for response. +* jc/maint-add-paranoid (2010-02-19) 2 commits + - paranoid: avoid unnecessary re-hashing + - Teach "git add" and friends to be paranoid -* jh/maint-submodule-status-in-void (2010-02-16) 1 commit - - submodule summary: Don't barf when invoked in an empty repo +This conflicts rather badly with more logical change by Nicolas in the +other thread; perhaps we should drop this "paranoia" for now. -Looked Ok for 'next' but I lost track somewhat... +* jc/maint-fix-mailinfo-strip (2010-02-19) 1 commit + - mailinfo: do not strip leading spaces even for a header line -* ld/maint-diff-quiet-w (2010-02-16) 1 commit - - git diff --quiet -w: check and report the status +Linus noticed that an indented first line in the log message body loses +its indentation. Lukas sent a lot more intrusive patch to keep the +removal of leading spaces for header lines while avoiding this issue, but +I think removing the leading blanks is wrong in either the message or +in-body header. -Needs tests but otherwise looked Ok. +* ne/pack-local-doc (2010-02-18) 1 commit + - Documentation: pack-objects: Clarify --local's semantics. -* ml/maint-grep-doc (2010-02-15) 1 commit - (merged to 'next' on 2010-02-16 at 4059a38) - + grep documentation: clarify what files match +Comments from pack experts? -Soon to graduate to 'master'. +* ml/connect-refactor (2010-02-17) 1 commit + - connect.c: move duplicated code to a new function 'get_host_and_port' -* tc/maint-transport-ls-remote-with-void (2010-02-16) 1 commit - (merged to 'next' on 2010-02-16 at e6ef1a8) - + transport: add got_remote_refs flag +* ml/encode-header-refactor (2010-02-16) 1 commit + - refactor duplicated encode_header in pack-objects and fast-import -Soon to graduate to 'master'. +* ml/fill-mm-refactor (2010-02-16) 1 commit + - refactor duplicated fill_mm() in checkout and merge-recursive -* bg/apply-blank-at-eof (2010-02-17) 3 commits - - t3417: Add test cases for "rebase --whitespace=fix" - - t4124: Add additional tests of --whitespace=fix - - apply: Allow blank context lines to match beyond EOF +These three should be safe for 'next' but I postponed them because they +were distractions compared to other topics I wanted to proccess first. -RFC. +* mm/mkstemps-mode-for-packfiles (2010-02-20) 6 commits + - Use git_mkstemp_mode instead of plain mkstemp to create object files + - git_mkstemps_mode: do not overwrite errno + - Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. + - git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument. + - Move gitmkstemps to path.c + - Add a testcase for ACL with restrictive umask. -* gf/maint-sh-setup-nongit-ok (2010-02-16) 1 commit - - require_work_tree broken with NONGIT_OK +The test does not seem to pass for me. -Looked sensible and ready for 'next'. +* rs/optim-text-wrap (2010-02-19) 4 commits + (merged to 'next' on 2010-02-21 at 70ef189) + + utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() + + utf8.c: remove strbuf_write() + + utf8.c: remove print_spaces() + + utf8.c: remove print_wrapped_text() -* ml/send-pack-transport-refactor (2010-02-16) 1 commit - - Refactoring: remove duplicated code from builtin-send-pack.c and transport.c +* tr/maint-cherry-pick-list (2010-02-20) 1 commit + (merged to 'next' on 2010-02-21 at 65fded0) + + cherry_pick_list: quit early if one side is empty -Probably ready for 'next'. +* tc/transport-verbosity (2010-02-18) 9 commits + - transport: update flags to be in running order + - pull: learn --progress + - fetch: learn --progress + - push: learn --progress + - transport->progress: use flag authoritatively + - clone: support multiple levels of verbosity + - push: support multiple levels of verbosity + - fetch: refactor verbosity option handling into transport.[ch] + - Documentation/git-push.txt: put --quiet before --verbose -* np/fast-import-idx-v2 (2010-02-17) 6 commits - - fast-import: use the diff_delta() max_delta_size argument - - fast-import: honor pack.indexversion and pack.packsizelimit config vars - - fast-import: make default pack size unlimited - - fast-import: use write_idx_file() instead of custom code - - fast-import: use sha1write() for pack data - - fast-import: start using struct pack_idx_entry +-------------------------------------------------- +[Stalled] + +* ld/push-porcelain (2010-02-09) 4 commits + - git-push: fix an error message so it goes to stderr + - git-push: make git push --dry-run --porcelain exit with status 0 even if updates will be rejected + - git-push: send "To " messages to the standard output in --porcelain mode + - git-push: squelch advice message if in --porcelain mode + +This needs further simplification, judging from the previous discussion? + +* ld/maint-diff-quiet-w (2010-02-16) 1 commit + - git diff --quiet -w: check and report the status + +Needs tests but otherwise looked Ok. * sd/format-patch-to (2010-02-17) 1 commit - Add 'git format-patch --to=' option and 'format.to' configuration variable. @@ -147,20 +183,21 @@ Probably ready for 'next', except that people need to be warned about having to update their scripts to explicitly pass --no-decorate to keep them working. -* jc/maint-status-preload (2010-02-17) 1 commit - - status: preload index to optimize lstat(2) calls +* pb/log-first-parent-p-m (2010-02-10) 1 commit + (merged to 'next' on 2010-02-17 at 2f8e5ae) + + git log -p -m: document -m and honor --first-parent --------------------------------------------------- -[Cooking] +Needs tests but otherwise looked fine. We might want to teach "-m trumps +implicit --cc" to "git show", but that is a totally separate topic. -* ld/push-porcelain (2010-02-09) 4 commits - - git-push: fix an error message so it goes to stderr - - git-push: make git push --dry-run --porcelain exit with status 0 even if updates will be rejected - - git-push: send "To " messages to the standard output in --porcelain mode - - git-push: squelch advice message if in --porcelain mode +* js/rebase-origin-x (2010-02-05) 1 commit + - [RFC w/o test and incomplete] rebase: add -x option to record original commit name + +I retract my objection against the idea of -x; needs polishing before +moving forward. -After some discussion this needs further simplification? May need to move -to Stalled. +-------------------------------------------------- +[Cooking] * cp/add-u-pathspec (2010-02-09) 2 commits - test for add with non-existent pathspec @@ -177,66 +214,79 @@ goes for pathspec_matches() in builtin-grep.c Incidentally, I've proposed "pathspec unification" as possible GSoC'10 project---with luck, we might finally see a progress on this front ;-) -* hm/maint-imap-send-crlf (2010-02-12) 1 commit - (merged to 'next' on 2010-02-17 at c6162cb) - + git-imap-send: Convert LF to CRLF before storing patch to draft box +* jc/for-each-ref (2010-02-13) 4 commits + (merged to 'next' on 2010-02-21 at c9a6c2f) + + for-each-ref --format='%(flag)' + + for-each-ref --format='%(symref) %(symref:short)' + + builtin-for-each-ref.c: check if we need to peel onion while parsing the format + + builtin-for-each-ref.c: comment fixes -Soon to graduate to 'master'. +* jn/gitweb-config-error-die (2010-02-14) 1 commit + (merged to 'next' on 2010-02-21 at e3ecd65) + + gitweb: Die if there are parsing errors in config file + +* jn/maint-fix-pager (2010-02-20) 7 commits + (merged to 'next' on 2010-02-21 at 640e10c) + + t7006-pager: if stdout is not a terminal, make a new one + + tests: Add tests for automatic use of pager + + am: Fix launching of pager + + git svn: Fix launching of pager + + git.1: Clarify the behavior of the --paginate option + + Make 'git var GIT_PAGER' always print the configured pager + + Fix 'git var' usage synopsis -* nd/root-git (2010-02-14) 5 commits - - Add test for using Git at root of file system - - Support working directory located at root - - Move offset_1st_component() to path.c - - init-db, rev-parse --git-dir: do not append redundant slash - - make_absolute_path(): Do not append redundant slash +* ml/color-when (2010-02-16) 1 commit + (merged to 'next' on 2010-02-21 at d52c051) + + Add an optional argument for --color options -How does this interact with the much larger series to rework the set-up -codepath? +* hm/imap-send-cram-md5 (2010-02-15) 1 commit + - imap-send: support CRAM-MD5 authentication -* pb/log-first-parent-p-m (2010-02-10) 1 commit - (merged to 'next' on 2010-02-17 at 2f8e5ae) - + git log -p -m: document -m and honor --first-parent +A potential clean-up sent as a counter-proposal; waiting for response. -Needs tests but otherwise looked fine. We might want to teach "-m trumps -implicit --cc" to "git show", but that is a totally separate topic. +* jh/maint-submodule-status-in-void (2010-02-16) 1 commit + (merged to 'next' on 2010-02-21 at 2e605c3) + + submodule summary: Don't barf when invoked in an empty repo -* sp/maint-push-sideband (2010-02-10) 8 commits - (merged to 'next' on 2010-02-16 at 6f19e5b) - + receive-pack: Send internal errors over side-band #2 - + t5401: Use a bare repository for the remote peer - + receive-pack: Send hook output over side band #2 - + receive-pack: Wrap status reports inside side-band-64k - + receive-pack: Refactor how capabilities are shown to the client - + send-pack: demultiplex a sideband stream with status data - + run-command: support custom fd-set in async - + run-command: Allow stderr to be a caller supplied pipe - (this branch is used by sp/push-sideband.) +* bg/apply-blank-at-eof (2010-02-17) 3 commits + - t3417: Add test cases for "rebase --whitespace=fix" + - t4124: Add additional tests of --whitespace=fix + - apply: Allow blank context lines to match beyond EOF -Based on 1.6.5 maintenance track. +RFC. -* sp/push-sideband (2010-02-10) 0 commits - (this branch uses sp/maint-push-sideband.) +* gf/maint-sh-setup-nongit-ok (2010-02-16) 1 commit + (merged to 'next' on 2010-02-21 at aca55e6) + + require_work_tree broken with NONGIT_OK -This also is in 'next' now. +* ml/send-pack-transport-refactor (2010-02-16) 1 commit + (merged to 'next' on 2010-02-21 at db276f4) + + refactor duplicated code in builtin-send-pack.c and transport.c + +* jc/maint-status-preload (2010-02-17) 1 commit + - status: preload index to optimize lstat(2) calls + +* nd/root-git (2010-02-14) 5 commits + - Add test for using Git at root of file system + - Support working directory located at root + - Move offset_1st_component() to path.c + - init-db, rev-parse --git-dir: do not append redundant slash + - make_absolute_path(): Do not append redundant slash * ac/cvsimport-revision-mapping (2010-02-06) 1 commit (merged to 'next' on 2010-02-17 at 6756446) + cvsimport: new -R option: generate .git/cvs-revisions mapping -Any comments from CVSimport users? - -* js/rebase-origin-x (2010-02-05) 1 commit - - [RFC w/o test and incomplete] rebase: add -x option to record original commit name - -I retract my objection against the idea of -x; needs polishing before -moving forward. +Will merge to 'master' shortly unless negative comments from CVSimport +users comes. * jn/maint-makedepend (2010-01-26) 5 commits - - Makefile: drop dependency on $(wildcard */*.h) - - Makefile: clean up http-walker.o dependency rules - - Makefile: remove wt-status.h from LIB_H - - Makefile: make sure test helpers are rebuilt when headers change - - Makefile: add missing header file dependencies + (merged to 'next' on 2010-02-21 at 34a3e48) + + Makefile: drop dependency on $(wildcard */*.h) + + Makefile: clean up http-walker.o dependency rules + + Makefile: remove wt-status.h from LIB_H + + Makefile: make sure test helpers are rebuilt when headers change + + Makefile: add missing header file dependencies (this branch is used by jn/makedepend and jn/master-makedepend.) * jn/master-makedepend (2010-01-26) 0 commits @@ -245,28 +295,54 @@ moving forward. This is to help merging the clean-up to "master". * jn/makedepend (2010-01-31) 9 commits - - Makefile: always remove .depend directories on 'make clean' - - Makefile: tuck away generated makefile fragments in .depend - - Teach Makefile to check header dependencies - - Makefile: list standalone program object files in PROGRAM_OBJS - - Makefile: lazily compute header dependencies - - Makefile: list generated object files in OBJECTS - - Makefile: disable default implicit rules - - Makefile: rearrange dependency rules - - Makefile: transport.o depends on branch.h now + (merged to 'next' on 2010-02-21 at 34a3e48) + + Makefile: always remove .depend directories on 'make clean' + + Makefile: tuck away generated makefile fragments in .depend + + Teach Makefile to check header dependencies + + Makefile: list standalone program object files in PROGRAM_OBJS + + Makefile: lazily compute header dependencies + + Makefile: list generated object files in OBJECTS + + Makefile: disable default implicit rules + + Makefile: rearrange dependency rules + + Makefile: transport.o depends on branch.h now (this branch uses jn/maint-makedepend and jn/master-makedepend.) -And this is to build on top. -Looked ok for 'next'. - -* jc/checkout-detached (2010-01-29) 1 commit - (merged to 'next' on 2010-02-17 at 7e03edc) - + Reword "detached HEAD" notification +* jh/notes (2010-02-13) 30 commits + (merged to 'next' on 2010-02-21 at 75fc451) + + builtin-notes: Add "copy" subcommand for copying notes between objects + + builtin-notes: Misc. refactoring of argc and exit value handling + + builtin-notes: Add -c/-C options for reusing notes + + builtin-notes: Refactor handling of -F option to allow combining -m and -F + + builtin-notes: Deprecate the -m/-F options for "git notes edit" + + builtin-notes: Add "append" subcommand for appending to note objects + + builtin-notes: Add "add" subcommand for adding notes to objects + + builtin-notes: Add --message/--file aliases for -m/-F options + + builtin-notes: Add "list" subcommand for listing note objects + + Documentation: Generalize git-notes docs to 'objects' instead of 'commits' + + builtin-notes: Add "prune" subcommand for removing notes for missing objects + + Notes API: prune_notes(): Prune notes that belong to non-existing objects + + t3305: Verify that removing notes triggers automatic fanout consolidation + + builtin-notes: Add "remove" subcommand for removing existing notes + + Teach builtin-notes to remove empty notes + + Teach notes code to properly preserve non-notes in the notes tree + + t3305: Verify that adding many notes with git-notes triggers increased fanout + + t3301: Verify successful annotation of non-commits + + Builtin-ify git-notes + + Refactor notes concatenation into a flexible interface for combining notes + + Notes API: Allow multiple concurrent notes trees with new struct notes_tree + + Notes API: write_notes_tree(): Store the notes tree in the database + + Notes API: for_each_note(): Traverse the entire notes tree with a callback + + Notes API: get_note(): Return the note annotating the given object + + Notes API: remove_note(): Remove note objects from the notes tree structure + + Notes API: add_note(): Add note objects to the internal notes tree structure + + Notes API: init_notes(): Initialize the notes tree from the given notes ref + + Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef + + Notes API: get_commit_notes() -> format_note() + remove the commit restriction + + Minor cosmetic fixes to notes.c -* jc/maint-fix-test-perm (2010-01-30) 2 commits - (merged to 'next' on 2010-02-16 at 9d2e037) - + lib-patch-mode.sh: Fix permission - + t6000lib: Fix permission +* jc/grep-author-all-match-implicit (2010-01-17) 1 commit + (merged to 'next' on 2010-02-17 at 3b7be80) + + "log --author=me --grep=it" should find intersection, not union * jh/gitweb-caching (2010-01-30) 1 commit - gitweb: Add an option to force version match @@ -274,59 +350,9 @@ Looked ok for 'next'. The controversial one. Will probably drop this. RFC v3 of gitweb caching series needs to be queued but hasn't happened yet. -* jn/makefile-script-lib (2010-01-31) 1 commit - (merged to 'next' on 2010-02-16 at f5334f5) - + Do not install shell libraries executable - -Soon to graduate to 'master'. - -* mv/request-pull-modernize (2010-01-29) 1 commit - (merged to 'next' on 2010-02-16 at be03aad) - + request-pull: avoid mentioning that the start point is a single commit - -Soon to graduate to 'master'. - -* jh/notes (2010-02-13) 30 commits - - builtin-notes: Add "copy" subcommand for copying notes between objects - - builtin-notes: Misc. refactoring of argc and exit value handling - - builtin-notes: Add -c/-C options for reusing notes - - builtin-notes: Refactor handling of -F option to allow combining -m and -F - - builtin-notes: Deprecate the -m/-F options for "git notes edit" - - builtin-notes: Add "append" subcommand for appending to note objects - - builtin-notes: Add "add" subcommand for adding notes to objects - - builtin-notes: Add --message/--file aliases for -m/-F options - - builtin-notes: Add "list" subcommand for listing note objects - - Documentation: Generalize git-notes docs to 'objects' instead of 'commits' - - builtin-notes: Add "prune" subcommand for removing notes for missing objects - - Notes API: prune_notes(): Prune notes that belong to non-existing objects - - t3305: Verify that removing notes triggers automatic fanout consolidation - - builtin-notes: Add "remove" subcommand for removing existing notes - - Teach builtin-notes to remove empty notes - - Teach notes code to properly preserve non-notes in the notes tree - - t3305: Verify that adding many notes with git-notes triggers increased fanout - - t3301: Verify successful annotation of non-commits - - Builtin-ify git-notes - - Refactor notes concatenation into a flexible interface for combining notes - - Notes API: Allow multiple concurrent notes trees with new struct notes_tree - - Notes API: write_notes_tree(): Store the notes tree in the database - - Notes API: for_each_note(): Traverse the entire notes tree with a callback - - Notes API: get_note(): Return the note annotating the given object - - Notes API: remove_note(): Remove note objects from the notes tree structure - - Notes API: add_note(): Add note objects to the internal notes tree structure - - Notes API: init_notes(): Initialize the notes tree from the given notes ref - - Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef - - Notes API: get_commit_notes() -> format_note() + remove the commit restriction - - Minor cosmetic fixes to notes.c - -Looked Ok for 'next'; comments? - * cc/reset-keep (2010-01-19) 5 commits - reset: disallow using --keep when there are unmerged entries - reset: disallow "reset --keep" outside a work tree - Documentation: reset: describe new "--keep" option - reset: add test cases for "--keep" option - reset: add option "--keep" to "git reset" - -* jc/grep-author-all-match-implicit (2010-01-17) 1 commit - (merged to 'next' on 2010-02-17 at 3b7be80) - + "log --author=me --grep=it" should find intersection, not union