git, branch v1.6.6-rc1

Git 1.6.6-rc1

2009-12-02T18:50:17Z

Signed-off-by: Junio C Hamano

git-pull.sh: Fix call to git-merge for new command format

2009-12-02T18:42:48Z

Now "git merge HEAD" is officially deprecated, we should clean our own use as well. Signed-off-by: Horst H. von Brand Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-12-02T18:30:12Z

* maint: Prepare for 1.6.5.4 merge: do not add standard message when message is given with -m option Do not misidentify "git merge foo HEAD" as an old-style invocation Conflicts: RelNotes

Prepare for 1.6.5.4

2009-12-02T18:29:00Z

Signed-off-by: Junio C Hamano

merge: do not add standard message when message is given with -m option

2009-12-02T18:02:08Z

Even if the user explicitly gave her own message to "git merge", the command still added its standard merge message. It resulted in a useless repetition like this: % git merge -m "Merge early part of side branch" `git rev-parse side~2` % git show -s commit 37217141e7519629353738d5e4e677a15096206f Merge: e68e646 a1d2374 Author: しらいしななこ Date: Wed Dec 2 14:33:20 2009 +0900 Merge early part of side branch Merge commit 'a1d2374f8f52f4e8a53171601a920b538a6cec23' The gave her own message because she didn't want git to add the standard message (if she wanted to, she wouldn't have given one, or she would have prepared it using git-fmt-merge-msg command). Noticed by Nanako Shiraishi Signed-off-by: Junio C Hamano

Do not misidentify "git merge foo HEAD" as an old-style invocation

2009-12-02T18:01:59Z

This was misinterpreted as an ancient style "git merge HEAD ..." that merges one (or more) into the current branch and record the resulting commit with the given message. Then a later sanity check found that there is no specified and gave a usage message. Tested-by: Nanako Shiraishi Signed-off-by: Junio C Hamano

Update draft release notes to 1.6.6 before -rc1

2009-12-01T20:50:23Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-12-01T20:47:04Z

* maint: help: Do not unnecessarily look for a repository Documentation: Fix a few i.e./e.g. mix-ups Documentation: Document --branch option in git clone synopsis

Merge branch 'jc/deprecate-old-syntax-from-merge'

2009-12-01T20:47:01Z

* jc/deprecate-old-syntax-from-merge: git-merge: a deprecation notice of the ancient command line syntax

git-merge: a deprecation notice of the ancient command line syntax

2009-12-01T20:45:34Z

The ancient form of git merge command used in the original sample script has been copied from Linus and are still found everywhere, I think, and people may still have it in their scripts, but on the other hand, it is so unintuitive that even people reasonably familiar with git are surprised by accidentally triggering the support to parse this ancient form. Gently nudge people to upgrade their script to more recent and readable style for eventual removal of the original syntax. Signed-off-by: Junio C Hamano