git/contrib, branch v1.4.2

Merge branch 'pb/configure'

2006-07-26T20:35:35Z

* pb/configure: Rename man1 and man7 variables to man1dir and man7dir Allow INSTALL, bindir, mandir to be set in main Makefile

git.el: Put the git customize group in the 'tools' parent group.

2006-07-24T06:36:05Z

Signed-off-by: Alexandre Julliard Signed-off-by: Junio C Hamano

git.el: Try to reuse an existing buffer when running git-status.

2006-07-24T06:36:03Z

By default, running git-status again will now reuse an existing buffer that displays the same directory. The old behavior of always creating a new buffer can be obtained by customizing the git-reuse-status-buffer option. Signed-off-by: Alexandre Julliard Signed-off-by: Junio C Hamano

git.el: Prepend a slash to the file name when adding to .gitignore.

2006-07-24T06:35:32Z

This way the ignore command will really only ignore the marked files and not files with the same name in subdirectories. Signed-off-by: Alexandre Julliard Signed-off-by: Junio C Hamano

git.el: Run git-rerere on commits if the rr-cache directory exists.

2006-07-24T06:35:29Z

Signed-off-by: Alexandre Julliard Signed-off-by: Junio C Hamano

Display help for Git mode after pressing `h' or `?' in git-status

2006-07-14T04:21:34Z

Add bindings for "h" and "?" in git-status-mode to display help about the mode, including keymap via (describe-function 'git-status-mode), like in PCL-CVS. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

Wrap long lines in docstrings in contrib/emacs/git.el

2006-07-14T04:21:27Z

Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

Fix more typos, primarily in the code

2006-07-10T07:36:44Z

The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano

git-svn: migrate out of contrib

2006-07-07T00:02:47Z

Allow NO_SVN_TESTS to be defined to skip git-svn tests. These tests are time-consuming due to SVN being slow, and even more so if SVN Perl libraries are not available. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

Fix print-log and diff compatibility with recent vc versions

2006-07-05T23:17:56Z

Here's a patch that fixes print-log and diff compatibility with recent vc versions, such as current GNU Emacs CVS. Signed-off-by: Ville Skytt,Ad(B