git, branch v1.5.6-rc2

GIT 1.5.6-rc2

2008-06-07T20:05:34Z

Signed-off-by: Junio C Hamano

Merge 1.5.5.4 in

2008-06-07T20:01:14Z

Signed-off-by: Junio C Hamano

GIT 1.5.5.4

2008-06-07T18:45:48Z

Signed-off-by: Junio C Hamano

git log --graph: print '*' for all commits, including merges

2008-06-06T18:56:43Z

Previously, merge commits were printed with 'M' instead of '*'. This had the potential to confuse users when not all parents of the merge commit were included in the log output. As Junio has pointed out, merge commits can almost always be easily identified from the log message, anyway. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

Use nonrelative paths instead of absolute paths for cloned repositories

2008-06-06T18:23:10Z

Particularly for the "alternates" file, if one will be created, we want a path that doesn't depend on the current directory, but we want to retain any symlinks in the path as given and any in the user's view of the current directory when the path was given. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano

documentation: move git(7) to git(1)

2008-06-06T18:18:28Z

As the "git" man page describes the "git" command at the end-user level, it seems better to move it to man section 1. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

documentation: convert "diffcore" and "repository-layout" to man pages

2008-06-06T18:14:52Z

This patch renames the following documents and at the same time converts them to the man format: diffcore.txt -> gitdiffcore.txt (man section 7) repository-layout.txt -> gitrepository-layout.txt (man section 5) Other documents that reference the above ones are changed accordingly. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

graph API: fix "git log --graph --first-parent"

2008-06-06T16:23:09Z

This change teaches the graph API that only the first parent of each commit is interesting when "--first-parent" was specified. This change also consolidates the graph parent walking logic into two new internal functions, first_interesting_parent() and next_interesting_parent(). A simpler fix would have been to simply break at the end of the 2 existing for loops when graph->revs->first_parent_only is set. However, this change seems nicer, especially if we ever need to add any new loops over the parent list in the future. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

Print info about "git help COMMAND" on git's main usage pages

2008-06-06T16:22:18Z

Git's main usage pages did not show "git help" as a way to get more information on a specific subcommand. This patch adds an info line after the list of git commands currently printed by "git", "git help", "git --help" and "git help --all". Signed-off-by: Teemu Likonen Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-06-06T16:21:48Z

* maint: git-for-each-ref.txt: minor improvements name-rev: Fix segmentation fault when using --all