user/sven/git.git/Documentation, 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

git-diff: resurrect the traditional empty "diff --git" behaviour

2007-09-01T06:30:14Z

The warning message to suggest "Consider running git-status" from "git-diff" that we experimented with during the 1.5.3 cycle turns out to be a bad idea. It robbed cache-dirty information from people who valued it, while still asking users to run "update-index --refresh". It was hoped that the new behaviour would at least have some educational value, but not showing the cache-dirty paths like before meant that the user would not even know easily which paths were cache-dirty, and it made the need to refresh the index look like even more unnecessary chore. This commit reinstates the traditional behaviour, but with a twist. By default, the empty "diff --git" output is totally squelched out from "git diff" output. At the end of the command, it automatically runs "update-index --refresh" as needed, without even bothering the user. In other words, people who do not care about the cache-dirtyness do not even have to see the warning. The traditional behaviour to see the stat-dirty output and to bypassing the overhead of content comparison can be specified by setting the configuration variable diff.autorefreshindex to false. Signed-off-by: Junio C Hamano

filter-branch: introduce convenience function "skip_commit"

2007-09-01T06:22:51Z

With this function, a commit filter can leave out unwanted commits (such as temporary commits). It does _not_ undo the changeset corresponding to that commit, but it _skips_ the revision. IOW no tree object is changed by this. If you like to commit early and often, but want to filter out all intermediate commits, marked by "@@@" in the commit message, you can now do this with git filter-branch --commit-filter ' if git cat-file commit $GIT_COMMIT | grep '@@@' > /dev/null; then skip_commit "$@"; else git commit-tree "$@"; fi' newbranch Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano