You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
117 lines
3.8 KiB
117 lines
3.8 KiB
What's in git.git (Jul 2008, issue #05; Tue, 15) |
|
|
|
maint 191a8e3 (GIT 1.5.6.3, 2008-07-13) |
|
master fcab40a (Merge branch 'mv/merge-in-c', 2008-07-15) |
|
------------------------------------------------------------------------ |
|
|
|
"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): |
|
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' |
|
|
|
|