What's in git.git (Jul 2008, issue #05; Tue, 15)

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