What's in git.git (Jul 2008, issue #06; Sat, 19)
Junio C Hamano
parent
bd83487faa
commit
c59130ad58
165
whatsin.txt
165
whatsin.txt
|
|
@ -1,117 +1,90 @@
|
|||
What's in git.git (Jul 2008, issue #05; Tue, 15)
|
||||
What's in git.git (Jul 2008, issue #06; Sat, 19)
|
||||
|
||||
maint 191a8e3 (GIT 1.5.6.3, 2008-07-13)
|
||||
master fcab40a (Merge branch 'mv/merge-in-c', 2008-07-15)
|
||||
maint a1b6fb0 (GIT 1.5.6.4, 2008-07-19)
|
||||
master 09651dd (Getting closer to 1.6.0-rc0, 2008-07-19)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
"Merge-in-C" is in, so is "rename .dotest", and remaining Windows bits.
|
||||
Now it is almost there for 1.6.0-rc0.
|
||||
* The 'maint' branch is at 1.5.6.4.
|
||||
|
||||
* The 'master' branch has these since the last announcement.
|
||||
* The 'master' branch has these since the last announcement
|
||||
in addition to what is already in 1.5.6.4.
|
||||
|
||||
Alexander N. Gavrilov (1):
|
||||
Fix quadratic performance in rewrite_one.
|
||||
Alexander Gavrilov (3):
|
||||
Avoid rescanning unchanged entries in search for copies.
|
||||
Do not try to detect move/copy for entries below threshold.
|
||||
Support gitlinks in fast-import.
|
||||
|
||||
Brian Gernhardt (1):
|
||||
Documentation: mention ORIG_HEAD in am, merge, and rebase
|
||||
Eric Raible (1):
|
||||
Teach lookup_prog not to select directories
|
||||
|
||||
Ciaran McCreesh (1):
|
||||
Make git-add -i accept ranges like 7-
|
||||
Eric Wong (1):
|
||||
t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"
|
||||
|
||||
Dmitry Kakurin (1):
|
||||
Fixed text file auto-detection: treat EOF character 032 at the end of
|
||||
file as printable
|
||||
Fabian Emmes (2):
|
||||
Testsuite: Unset CVS_SERVER
|
||||
testsuite for cvs co -c
|
||||
|
||||
Frederik Schwarzer (1):
|
||||
git-svn: typofix
|
||||
Johannes Sixt (1):
|
||||
builtin-clone: rewrite guess_dir_name()
|
||||
|
||||
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
|
||||
Junio C Hamano (9):
|
||||
git-rebase: report checkout failure
|
||||
t/aggregate-results: whitespace fix
|
||||
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
|
||||
read-cache.c: typofix
|
||||
mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
|
||||
builtin-remote.c: fix earlier "skip_prefix()" conversion
|
||||
t9001 (send-email): Do not use hardcoded /bin/sh in test
|
||||
.mailmap update
|
||||
Getting closer to 1.6.0-rc0
|
||||
|
||||
Lukas Sandström (1):
|
||||
git-mailinfo: Fix getting the subject from the in-body [PATCH] line
|
||||
Lars Noschinski (2):
|
||||
cvsserver: Add support for packed refs
|
||||
cvsserver: Add cvs co -c support
|
||||
|
||||
Mark Levedahl (2):
|
||||
git-submodule - make "submodule add" more strict, and document it
|
||||
git-submodule - register submodule URL if adding in place
|
||||
Lukas Sandström (3):
|
||||
Make some strbuf_*() struct strbuf arguments const.
|
||||
Add some useful functions for strbuf manipulation.
|
||||
git-mailinfo: use strbuf's instead of fixed buffers
|
||||
|
||||
Mike Pape (1):
|
||||
We need to check for msys as well as Windows in add--interactive.
|
||||
Miklos Vajna (4):
|
||||
t0001-init.sh: change confusing directory name
|
||||
t1007-hash-object.sh: use quotes for the test description
|
||||
git-bisect: use dash-less form on git bisect log
|
||||
make remove-dashes: apply to scripts and programs as well, not just to
|
||||
builtins
|
||||
|
||||
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
|
||||
Nanako Shiraishi (3):
|
||||
cache-tree.c: make cache_tree_find() static
|
||||
builtin-describe.c: make a global variable "pattern" static
|
||||
parse-options.c: make check_typos() static
|
||||
|
||||
Nicolas Pitre (1):
|
||||
restore legacy behavior for read_sha1_file()
|
||||
Peter Harris (1):
|
||||
Add ANSI control code emulation for the Windows console
|
||||
|
||||
Olivier Marin (1):
|
||||
builtin-rerere: more carefully find conflict markers
|
||||
Petr Baudis (5):
|
||||
Documentation/git-submodule.txt: Add Description section
|
||||
Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles
|
||||
Documentation/git-submodule.txt: Further clarify the description
|
||||
Documentation: How to ignore local changes in tracked files
|
||||
Documentation/git-merge.txt: Partial rewrite of How Merge Works
|
||||
|
||||
Pavel Roskin (1):
|
||||
t9600: allow testing with cvsps 2.2, including beta versions
|
||||
René Scharfe (8):
|
||||
archive: remove args member from struct archiver
|
||||
add context pointer to read_tree_recursive()
|
||||
archive: add baselen member to struct archiver_args
|
||||
archive: centralize archive entry writing
|
||||
archive: unify file attribute handling
|
||||
archive: remove extra arguments parsing code
|
||||
archive: make zip compression level independent from core git
|
||||
archive: remove unused headers
|
||||
|
||||
Pierre Habouzit (1):
|
||||
parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
|
||||
Stephan Beyer (4):
|
||||
t/test-lib.sh: exit with small negagive int is ok with test_must_fail
|
||||
t/: Use "test_must_fail git" instead of "! git"
|
||||
Make usage strings dash-less
|
||||
Link git-shell only to a subset of libgit.a
|
||||
|
||||
Shawn O. Pearce (3):
|
||||
bash completion: Append space after file names have been completed
|
||||
bash completion: Resolve git show ref:path<tab> 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'
|
||||
SungHyun Nam (1):
|
||||
t/Makefile: use specified shell when running aggregation script
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue