There's a patch at the bottom of this, so please look at that first before
my reading my whining immediately below.

I'm having some troubles with git pull, so this is just an ordinary diff.
Otherwise, I would have used the in-house diff command.

patch: **** Only garbage was found in the patch input.
<more troubles>
Tracked branch, applying changes...
error: bad signature
error: verify header failed
read_cache: Invalid argument
error: bad signature
error: verify header failed
error: bad signature
error: verify header failed
</more troubles>

Anyway, it's late, and I'm sure there is an easy fix to the above.

Here is a patch which provides the comment lines in the associated
script files when the git help command is invoked with an argument

[EMAIL PROTECTED] git-pasky-new]$ ./git help merge

 Merge a branch to the current tree.
 Copyright (c) Petr Baudis, 2005

 Takes a parameter identifying the branch to be merged.
 Optional "-b base_commit" parameter specifies the base for the
 merge. "-a" parameter may come first to tell git merge
 to check out the full tree to the merge tree.

 It creates a new ,,merge/ directory, which is git-controlled
 but has only the changed files checked out. You then have to
 examine it and then do git commit, which will also automatically
 bring your working tree up-to-date.

This patch will provide the comment lines in the shell script associated
with the command, cleaned up a bit for presentation.

BUGS: This will also print any comments in the entire file, which may
not be desired.  If a command name and shell script filename
do not follow the usual convention, this won't work, e.g. ci for commit.

Signed-off-by: Steven Cole <[EMAIL PROTECTED]>

--- gp-newest-orig/git  2005-04-17 22:16:55.000000000 -0600
+++ gp-newest/git       2005-04-17 22:19:49.000000000 -0600
@@ -19,6 +19,11 @@
 help () {
+if [ ! $command ]; then
        cat <<__END__
 The GIT scripted toolkit  $(
@@ -48,7 +53,10 @@
        update          COMMIT_ID
+Additional help is available with: git help COMMAND
 Note that these expressions can be used interchangably as "ID"s:
        empty string (current HEAD)
        local (the local branch if tracking a remote one)
        remote name (as registered with git addremote)
@@ -57,6 +65,10 @@
        commit object hash (as returned by commit-id)
        tree object hash (accepted only by some commands)
+if [ ! $scriptfile = "" ]; then
+grep ^# $scriptfile | grep -v "!/bin" | cut -c 2-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to