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.
107 lines
3.1 KiB
107 lines
3.1 KiB
Subject: What's in git.git (Aug 2008, #07; Wed, 27) |
|
X-maint-at: c67b1fa349cc7b4341b32b9ef1c58a3821ce0830 |
|
X-master-at: a1184d85e8752658f02746982822f43f32316803 |
|
X-maint-was: 913e0e99b6a6e63af6a062622a1f94bd78fd8052 |
|
X-master-was: d6096f17d2d5d9ccb453aabf8edc6ee238b166fc |
|
|
|
What's in git.git (Aug 2008, #07; Wed, 27) |
|
|
|
maint c67b1fa (ctype.c: protect tiny C preprocessor constants) |
|
master a1184d8 (Merge branch 'mv/merge-custom') |
|
------------------------------------------------------------------------ |
|
|
|
Handful fixes went to 1.6.0.1 and then a few more are on 'maint'. |
|
|
|
On the 'master' front, among other things: |
|
|
|
- "git cherry-pick" can reuse earlier conflict resolution. |
|
|
|
- "git merge" can use a custom strategy (if you write one). |
|
|
|
- "git-shell" was broken and then fixed. |
|
|
|
- "git submodule sync" is a new subcommand. |
|
|
|
* The 'maint' branch has these fixes since the last announcement. |
|
|
|
Alexander Gavrilov (1): |
|
Respect core.autocrlf in combined diff |
|
|
|
Jeff King (1): |
|
Fix "git log -i --grep" |
|
|
|
Jonathan Nieder (2): |
|
Documentation: clarify pager.<cmd> configuration |
|
Documentation: clarify pager configuration |
|
|
|
Junio C Hamano (3): |
|
merge: fix numerous bugs around "trivial merge" area |
|
GIT 1.6.0.1 |
|
ctype.c: protect tiny C preprocessor constants |
|
|
|
Linus Torvalds (1): |
|
index-pack: be careful after fixing up the header/footer |
|
|
|
Miklos Vajna (1): |
|
Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX |
|
|
|
Nguyễn Thái Ngọc Duy (1): |
|
index-pack: setup git repository |
|
|
|
Ramsay Allan Jones (2): |
|
Fix a warning (on cygwin) to allow -Werror |
|
Suppress some bash redirection error messages |
|
|
|
Simon Hausmann (1): |
|
Clean up the git-p4 documentation |
|
|
|
|
|
* The 'master' branch has these since the last announcement |
|
in addition to the above. |
|
|
|
Abhijit Menon-Sen (1): |
|
Make cherry-pick use rerere for conflict resolution. |
|
|
|
Andreas Färber (1): |
|
Makefile: always provide a fallback when hardlinks fail |
|
|
|
David Aguilar (1): |
|
git-submodule: add "sync" command |
|
|
|
Gustaf Hendeby (1): |
|
Update .gitignore to ignore git-help |
|
|
|
Jeff King (1): |
|
format-patch: use default diff format even with patch options |
|
|
|
Junio C Hamano (7): |
|
builtin-add.c: restructure the code for maintainability |
|
builtin-add.c: optimize -A option and "git add ." |
|
shell: do not play duplicated definition games to shrink the executable |
|
Build-in "git-shell" |
|
Fix "git-merge -s bogo" help text |
|
t7606: fix custom merge test |
|
Revert "Build-in "git-shell"" |
|
|
|
Mark Levedahl (3): |
|
git-submodule.sh - Remove trailing / from URL if found |
|
git-submodule.sh - Remove trailing / from URL if found |
|
git-submodule - Use "get_default_remote" from git-parse-remote |
|
|
|
Miklos Vajna (6): |
|
builtin-help: make some internal functions available to other builtins |
|
builtin-merge: allow using a custom strategy |
|
Add a new test for using a custom merge strategy |
|
Add a second testcase for handling invalid strategies in git-merge |
|
builtin-help: always load_command_list() in cmd_help() |
|
Builtin git-help. |
|
|
|
Nicolas Pitre (1): |
|
discard revindex data when pack list changes |
|
|
|
Simon Hausmann (1): |
|
Make it possible to abort the submission of a change to Perforce |
|
|
|
Tommi Virtanen (1): |
|
Install git-shell in bindir, too |
|
|
|
|