From: Jonas Fonseca <fonseca@diku.dk>
To: Petr Baudis <pasky@ucw.cz>, git@vger.kernel.org
Subject: [PATCH] cg-merge: Improve the hook description
Date: Sun, 11 Dec 2005 20:07:33 +0100 [thread overview]
Message-ID: <20051211190733.GE2960@diku.dk> (raw)
Make 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(-)
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
reply other threads:[~2005-12-11 19:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051211190733.GE2960@diku.dk \
--to=fonseca@diku.dk \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).