user/sven/git.git, branch v1.5.3.1

GIT 1.5.3.1: obsolete git-p4 in RPM spec file.

2007-09-03T08:28:37Z

HPA noticed that yum does not like the newer git RPM set; it turns out that we do not ship git-p4 anymore but existing installations do not realize the package is gone if we do not tell anything about it. David Kastrup suggests using Obsoletes in the spec file of the new RPM to replace the old package, so here is a try. Signed-off-by: Junio C Hamano

Typofix: 1.5.3 release notes

2007-09-02T22:03:26Z

GIT 1.5.3

2007-09-02T07:00:00Z

Signed-off-by: Junio C Hamano

Merge branch 'jp/send-email-cc'

2007-09-01T20:15:27Z

* jp/send-email-cc: git-send-email --cc-cmd

Mention -m as an abbreviation for --merge

2007-09-01T17:36:56Z

Signed-off-by: Robin Rosenberg Signed-off-by: Junio C Hamano

Update my contact address as the maintainer.

2007-09-01T11:09:51Z

Documentation: minor AsciiDoc mark-up fixes.

2007-09-01T11:06:13Z

Signed-off-by: Junio C Hamano

URL: allow port specification in ssh:// URLs

2007-09-01T10:35:29Z

Allow port specification in ssh:// URLs in the usual notation: ssh://[user@]host.domain[:]/ This allows git to be used over ssh-tunneling networks. Signed-off-by: Luben Tuikov Signed-off-by: Junio C Hamano

Avoid one-or-more (\+) non BRE in sed scripts.

2007-09-01T09:35:30Z

Signed-off-by: Junio C Hamano

rebase -m: Fix incorrect short-logs of already applied commits.

2007-09-01T09:23:05Z

When a topic branch is rebased, some of whose commits are already cherry-picked upstream: o--X--A--B--Y <- master \ A--B--Z <- topic then 'git rebase -m master' would report: Already applied: 0001 Y Already applied: 0002 Y With this fix it reports the expected: Already applied: 0001 A Already applied: 0002 B As an added bonus, this change also avoids 'echo' of a commit message, which might contain escapements. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano