{"thread":{"id":"2804","subject":"[PATCH] cg-merge: Improve the hook description","startedAt":"2005-12-11T19:07:33Z","lastAt":"2005-12-11T19:07:33Z","messageCount":1,"participants":["Jonas Fonseca"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"13492","messageId":"20051211190733.GE2960@diku.dk","threadId":"2804","inReplyTo":null,"subject":"[PATCH] cg-merge: Improve the hook description","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-12-11T19:07:33Z","receivedAt":"2005-12-11T19:07:33Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Make it into a HOOKS section and place the argument list in the term\nline.\n\nSigned-off-by: Jonas Fonseca <fonseca@diku.dk>\n\n---\n\n Just an idea. The current thing is renderered poorly in cg-merge(1).\n\ncommit 4b1142df28132c12ce82c71757c417d8d41474ca\ntree 3c317897b6ce1dde87d5ab41b1611fce3c902e56\nparent 3b8f92d921868da0af9195db03b277650147498f\nauthor Jonas Fonseca <fonseca@diku.dk> Tue, 06 Dec 2005 23:57:22 +0100\ncommitter Jonas Fonseca <fonseca@antimatter.localdomain> Tue, 06 Dec 2005 23:57:22 +0100\n\n cg-merge |   24 +++++++++++-------------\n 1 files changed, 11 insertions(+), 13 deletions(-)\n\ndiff --git a/cg-merge b/cg-merge\nindex 08a6075..c06e4be 100755\n--- a/cg-merge\n+++ b/cg-merge\n@@ -64,23 +64,21 @@\n #\t\"do it I\", \"fix it\", \"do it II\", \"fix it II\", \"fix it III\" commits\n #\tlike you would get with a regular merge).\n #\n-# FILES\n+# HOOKS\n # -----\n-# $GIT_DIR/hooks/merge-pre::\n+# '.git/hooks/merge-pre' BRANCH BASE CURHEAD MERGEDHEAD MERGETYPE::\n #\tIf the file exists and is executable it will be executed right\n-#\tbefore the merge itself happens. The script is passed those\n-#\targuments:\n-#\t\tBRANCHNAME BASE CURHEAD MERGEDHEAD MERGETYPE\n-#\tMERGETYPE is either \"forward\", \"squash\", or \"tree\". The merge is\n-#\tcancelled if the script returns non-zero exit code.\n+#\tbefore the merge itself happens. The merge is cancelled if the script\n+#\treturns non-zero exit code.\n+#\t - MERGETYPE is either \"forward\", \"squash\", or \"tree\".\n #\n-# $GIT_DIR/hooks/merge-post::\n+# '.git/hooks/merge-post' BRANCH BASE CURHEAD MERGEDHEAD MERGETYPE STATUS::\n #\tIf the file exists and is executable it will be executed after\n-#\tthe merge is done. The script is passed those arguments:\n-#\t\tBRANCHNAME BASE CURHEAD MERGEDHEAD MERGETYPE STATUS\n-#\tMERGETYPE is either \"forward\", \"squash\", or \"tree\". For \"forward\",\n-#\tthe STATUS is always \"ok\", while for \"squash\" and \"tree\" the STATUS\n-#\tcan be \"localchanges\", \"conflicts\", \"nocommit\", or \"ok\".\n+#\tthe merge is done.\n+#\t - MERGETYPE is either \"forward\", \"squash\", or \"tree\".\n+#\t - For 'forward', the STATUS is always \"ok\", while for \"squash\"\n+#\t   and \"tree\" the STATUS can be \"localchanges\", \"conflicts\",\n+#\t   \"nocommit\", or \"ok\".\n \n # Developer's documentation:\n #\n\n-- \nJonas Fonseca\n"}]}