Hi, > >> when Git does a merge (no conflicts), it auto-generates a commit message > >> like: > >> > >> Merge branch 'master' of /path/to/other/repo > >> > >> How can I change this so my required string gets written at the > >> beginning of the commit message. > > > > s/./?/ > > Where do I do the substitution in this case? In the question that you sent to the list ;-) (But something like s/\./?/ makes more sense.) The real answer of Johannes to your question was only: > You might be happy with a post-merge hook amending the commit with a > completely different message. Meaning, you should put something like #!/bin/sh git commit -m "This is my new commit message." --amend or better: #!/bin/sh git commit --amend -m "$(git cat-file commit HEAD | sed -e '1,/^$/d;s/^/YOUR SIMPLE STATIC STRING HERE\n\n/')" into .git/hooks/post-merge (and make it executable). YOUR SIMPLE STATIC STRING HERE is the new first line. Replace the \n\n by a space to get someting like "YOUR SIMPLE STATIC STRING HERE Merge foo into HEAD." > Also, having the prepare-commit-msg hook add text had the side-effect > that in my normal commits, the message was always accepted, even when > I wanted to abort (vi using :q!). Let the commit-msg hook add the text afterwards. Or remove the prepared commit message in vi and then press :x (or :wq), because commit aborts on an *empty* commit message and not on an unchanged commit message. Regards, Stephan -- Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F
Attachment:
signature.asc
Description: Digital signature
