Jonas FonsecaMake it into a HOOKS section and place the argument list in the term line.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---
Just an idea. The current thing is renderered poorly in cg-merge(1).
commit 4b1142df28132c12ce82c71757c417d8d41474ca tree 3c317897b6ce1dde87d5ab41b1611fce3c902e56 parent 3b8f92d921868da0af9195db03b277650147498f author Jonas Fonseca <fonseca@diku.dk> Tue, 06 Dec 2005 23:57:22 +0100 committer Jonas Fonseca <fonseca@antimatter.localdomain> Tue, 06 Dec 2005 23:57:22 +0100
cg-merge | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-)
Show changes to cg-merge +11 −13
diff --git a/cg-merge b/cg-merge index 08a6075..c06e4be 100755 --- a/cg-merge +++ b/cg-merge @@ -64,23 +64,21 @@ # "do it I", "fix it", "do it II", "fix it II", "fix it III" commits # like you would get with a regular merge). # -# FILES +# HOOKS # ----- -# $GIT_DIR/hooks/merge-pre:: +# '.git/hooks/merge-pre' BRANCH BASE CURHEAD MERGEDHEAD MERGETYPE:: # If the file exists and is executable it will be executed right -# before the merge itself happens. The script is passed those -# arguments: -# BRANCHNAME BASE CURHEAD MERGEDHEAD MERGETYPE -# MERGETYPE is either "forward", "squash", or "tree". The merge is -# cancelled if the script returns non-zero exit code. +# before the merge itself happens. The merge is cancelled if the script +# returns non-zero exit code. +# - MERGETYPE is either "forward", "squash", or "tree". # -# $GIT_DIR/hooks/merge-post:: +# '.git/hooks/merge-post' BRANCH BASE CURHEAD MERGEDHEAD MERGETYPE STATUS:: # If the file exists and is executable it will be executed after -# the merge is done. The script is passed those arguments: -# BRANCHNAME BASE CURHEAD MERGEDHEAD MERGETYPE STATUS -# MERGETYPE is either "forward", "squash", or "tree". For "forward", -# the STATUS is always "ok", while for "squash" and "tree" the STATUS -# can be "localchanges", "conflicts", "nocommit", or "ok". +# the merge is done. +# - MERGETYPE is either "forward", "squash", or "tree". +# - For 'forward', the STATUS is always "ok", while for "squash" +# and "tree" the STATUS can be "localchanges", "conflicts", +# "nocommit", or "ok". # Developer's documentation: #
-- Jonas Fonseca