From: Junio C Hamano Date: Mon, 21 Jul 2008 06:59:37 +0000 (-0700) Subject: What's in git.git (Jul 2008, issue #05; Tue, 15) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd83487faad5a7de656927600c984bc38c6391a8;p=thirdparty%2Fgit.git What's in git.git (Jul 2008, issue #05; Tue, 15) --- diff --git a/whatsin.txt b/whatsin.txt index 2d39d5c11b..73dafc520d 100644 --- a/whatsin.txt +++ b/whatsin.txt @@ -1,111 +1,117 @@ -What's in git.git (Jul 2008, issue #04; Sun, 13) +What's in git.git (Jul 2008, issue #05; Tue, 15) maint 191a8e3 (GIT 1.5.6.3, 2008-07-13) - master 10ce020 (Merge branch 'sp/maint-bash-completion-optim', 2008-07-13) + master fcab40a (Merge branch 'mv/merge-in-c', 2008-07-15) ------------------------------------------------------------------------ -* The 'maint' branch is at 1.5.6.3 - -* The 'master' branch has these since the last announcement - in addition to what's in 1.5.6.3 - -Abhijit Menon-Sen (2): - Implement "git stash branch " - Add a test for "git stash branch" - -Adam Brewster (1): - Teach git-bundle to read revision arguments from stdin like git-rev-list. - -Brandon Casey (1): - t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects - -Eric Hanchrow (2): - user-manual: typo and grammar fixes - Documentation: fix broken "linkgit" links - -Eric Raible (2): - Documentation: tweak use case in "git stash save --keep-index" - completion: add branch options --contains --merged --no-merged - -Jeff King (2): - Allow per-command pager config - avoid null SHA1 in oldest reflog - -Johannes Schindelin (2): - Teach "git apply" to prepend a prefix with "--root=" - Allow cherry-picking root commits - -Johannes Sixt (1): - Provide fallback definitions of PRIu32 and PRIx32 - -Junio C Hamano (17): - revision traversal: --children option - rev-list --children - builtin-blame.c: move prepare_final() into a separate function. - builtin-blame.c: allow more than 16 parents - git-blame --reverse - Per-ref reflog expiry configuration - Make default expiration period of reflog used for stash infinite - apply --root: thinkofix. - Refactor "tracking statistics" code used by "git checkout" - git-status: show the remote tracking statistics - git-branch -v: show the remote tracking statistics - stat_tracking_info(): clear object flags used during counting - branch -r -v: do not spit out garbage - git-apply --directory: make --root more similar to GNU diff - Tone down warning about GNU Interactive Tools - Documentation: update sections on naming revisions and revision ranges - apply: fix copy/rename breakage - -Mark Levedahl (1): - install-doc-quick - use git --exec-path to find git-sh-setup - -Mike Hommey (4): - Catch failures from t5540-http-push - Fix http-push test - Skip t5540-http-push test when USE_CURL_MULTI is undefined - Avoid apache complaining about lack of server's FQDN - -Petr Baudis (1): - Git.pm: Add remote_refs() git-ls-remote frontend - -Pierre Habouzit (12): - parse-opt: have parse_options_{start,end}. - parse-opt: Export a non NORETURN usage dumper. - parse-opt: create parse_options_step. - parse-opt: do not print errors on unknown options, return -2 intead. - parse-opt: fake short strings for callers to believe in. - parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option. - revisions: split handle_revision_opt() from setup_revisions() - git-blame: migrate to incremental parse-option [1/2] - git-blame: migrate to incremental parse-option [2/2] - git-blame: fix lapsus - git-shortlog: migrate to parse-options partially. - revisions: refactor handle_revision_opt into parse_revision_opt. - -Ramsay Allan Jones (3): - t9113-*.sh: provide user feedback when test skipped - t9100-git-svn-basic.sh: Fix determination of utf-8 locale - git-request-pull: replace call to deprecated peek-remote - -Robert Shearman (1): - git-send-email: Fix authenticating on some servers when using TLS. - -SZEDER Gábor (1): - stash: introduce 'stash save --keep-index' option +"Merge-in-C" is in, so is "rename .dotest", and remaining Windows bits. +Now it is almost there for 1.6.0-rc0. + +* The 'master' branch has these since the last announcement. + +Alexander N. Gavrilov (1): + Fix quadratic performance in rewrite_one. + +Brian Gernhardt (1): + Documentation: mention ORIG_HEAD in am, merge, and rebase + +Ciaran McCreesh (1): + Make git-add -i accept ranges like 7- + +Dmitry Kakurin (1): + Fixed text file auto-detection: treat EOF character 032 at the end of + file as printable + +Frederik Schwarzer (1): + git-svn: typofix + +Ian Katz (1): + tutorial: use prompt with user names in example, to clarify who is doing + what + +Johannes Schindelin (6): + Convert CR/LF to LF in tag signatures + Add pretty format %aN which gives the author name, respecting .mailmap + Move MERGE_RR from .git/rr-cache/ into .git/ + git-gui: MERGE_RR lives in .git/ directly with newer Git versions + shortlog: support --pretty=format: option + Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" + +João Abecasis (1): + git-svn: find-rev and rebase for SVN::Mirror repositories + +Junio C Hamano (10): + Introduce get_merge_bases_many() + Introduce reduce_heads() + Teach "am" and "rebase" to mark the original position with ORIG_HEAD + branch --contains: default to HEAD + branch --merged/--no-merged: allow specifying arbitrary commit + Teach merge.log to "git-merge" again + Update draft release notes for 1.6.0 + reduce_heads(): protect from duplicate input + tutorial: clarify "pull" is "fetch + merge" + Update draft release notes to 1.6.0 + +Lukas Sandström (1): + git-mailinfo: Fix getting the subject from the in-body [PATCH] line + +Mark Levedahl (2): + git-submodule - make "submodule add" more strict, and document it + git-submodule - register submodule URL if adding in place + +Mike Pape (1): + We need to check for msys as well as Windows in add--interactive. + +Miklos Vajna (15): + Move split_cmdline() to alias.c + Move commit_list_count() to commit.c + Move parse-options's skip_prefix() to git-compat-util.h + Add new test to ensure git-merge handles pull.twohead and pull.octopus + Move read_cache_unmerged() to read-cache.c + git-fmt-merge-msg: make it usable from other builtins + Introduce get_octopus_merge_bases() in commit.c + Add new test to ensure git-merge handles more than 25 refs. + Add new test case to ensure git-merge reduces octopus parents when + possible + Add new test case to ensure git-merge prepends the custom merge message + git-commit-tree: make it usable from other builtins + Fix t7601-merge-pull-config.sh on AIX + Build in merge + t6021: add a new test for git-merge-resolve + Add a new test for git-merge-resolve + +Nicolas Pitre (1): + restore legacy behavior for read_sha1_file() + +Olivier Marin (1): + builtin-rerere: more carefully find conflict markers + +Pavel Roskin (1): + t9600: allow testing with cvsps 2.2, including beta versions + +Pierre Habouzit (1): + parse-options: add PARSE_OPT_LASTARG_DEFAULT flag Shawn O. Pearce (3): - Correct pack memory leak causing git gc to try to exceed ulimit - bash completion: Improve responsiveness of git-log completion - bash completion: Don't offer "a.." as a completion for "a." - -Stephan Beyer (3): - git-am/git-mailsplit: correct synopsis for reading from stdin - t3404: test two "preserve merges with -p" cases - Make rebase--interactive use OPTIONS_SPEC - -Thomas Rast (3): - git-add--interactive: replace hunk recounting with apply --recount - git-add--interactive: remove hunk coalescing - git-add--interactive: manual hunk editing mode + bash completion: Append space after file names have been completed + bash completion: Resolve git show ref:path losing ref: portion + bash completion: Remove dashed command completion support + +Soeren Finster (1): + git-gui: Exit shortcut in MacOSX repaired + +Steffen Prohaska (3): + Move code interpreting path relative to exec-dir to new function + system_path() + help.c: Add support for htmldir relative to git_exec_path() + help (Windows): Display HTML in default browser using Windows' shell API + +Stephan Beyer (1): + rerere: Separate libgit and builtin functions + +Sverre Hvammen Johansen (1): + reduce_heads(): thinkofix + +Teemu Likonen (1): + bash: Add long option completion for 'git send-email'