git, branch v1.5.4-rc0

GIT 1.5.4-rc0

2007-12-13T01:48:21Z

Signed-off-by: Junio C Hamano

Merge branch 'cc/help'

2007-12-13T01:46:16Z

* cc/help: RPM spec: Adjust htmldir git-help -w: do not require to be in git repository git.spec.in: remove python_path Documentation: rename git.texi to user-manual.texi Add git-browse-help to .gitignore git-help -i: show info documentation from matching version of git git-help -i: invoke info with document and node name Documentation: add gitman.info target Documentation: describe -w/--web option to "git-help". Use {web,instaweb,help}.browser config options. git-help: add -w|--web option to display html man page in a browser. Documentation: describe -i/--info option to "git-help" git-help: add -i|--info option to display info page.

RPM spec: Adjust htmldir

2007-12-13T01:41:58Z

git help -w needs to know the right location of installed pages. Signed-off-by: Junio C Hamano

git-help -w: do not require to be in git repository

2007-12-13T01:41:58Z

The users used to be able to say "git help cat-file" from anywhere, but the browse-help script insisted to be in a git repository, which caused "git help -w cat-file" to barf outside. Correct it. While at it, remove leftover debugging "echo". Signed-off-by: Junio C Hamano

Merge branch 'jc/shortlog-e'

2007-12-13T01:07:03Z

* jc/shortlog-e: shortlog: default to HEAD when the standard input is a tty Invert numbers and names in the git-shortlog summary mode. shortlog: document -e option git-shortlog -e: show e-mail address as well

Merge branch 'ew/svn-rev-db'

2007-12-13T00:53:06Z

* ew/svn-rev-db: git-svn: reinstate old rev_db optimization in new rev_map git-svn: replace .rev_db with a more space-efficient .rev_map format

Merge branch 'jc/merge-recursive-gitlink'

2007-12-13T00:52:59Z

* jc/merge-recursive-gitlink: Support a merge with conflicting gitlink change

Merge branch 'jk/svn-color'

2007-12-13T00:52:51Z

* jk/svn-color: git-svn: get color config from --get-colorbool Support GIT_PAGER_IN_USE environment variable

git.spec.in: remove python_path

2007-12-12T21:42:12Z

We do not depend on python nor customize scripts for it anymore. Signed-off-by: Junio C Hamano

Documentation: rename git.texi to user-manual.texi

2007-12-12T21:31:02Z

Signed-off-by: Junio C Hamano