{"thread":{"id":"8118","subject":"[StGIT PATCH v2] Document patch syntax.","startedAt":"2007-05-12T18:59:30Z","lastAt":"2007-05-13T13:58:05Z","messageCount":4,"participants":["Yann Dirson","Karl Hasselström"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"41947","messageId":"20070512185919.26101.3956.stgit@gandelf.nowhere.earth","threadId":"8118","inReplyTo":null,"subject":"[StGIT PATCH v2] Document patch syntax.","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-05-12T18:59:30Z","receivedAt":"2007-05-12T18:59:30Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"\nAcked-by: Karl Hasselstr�m \n\nSigned-off-by: Yann Dirson \n---\n\n Documentation/stg.txt | 25 +++++++++++++++++++++++++\n 1 files changed, 25 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/stg.txt b/Documentation/stg.txt\nindex af57c37..bc2a6fe 100644\n--- a/Documentation/stg.txt\n+++ b/Documentation/stg.txt\n@@ -51,6 +51,31 @@ Development branch::\n In such a setup, not all commits on your branch need to be StGIT\n patches; there may be regular GIT commits below your stack base.\n \n+Patches\n+~~~~~~~\n+\n+Many StGIT commands take references to StGIT patches as arguments.\n+Patches in the stack are identified with a short name, which must be\n+unique in the stack.\n+\n+Patches in the current stack are just refered to by their name. Some\n+commands allow you to specify a patch in another stack of the repository;\n+this is done by suffixing the patch name with an '@' sign followed by the\n+branch name (eg. 'thispatch@otherbranch').\n+\n+A number of positions in the stack related to the patch are also\n+accessible through '//' suffixes. For example, 'patch//top' is\n+equivalent to 'patch', and 'patch//bottom' refers to the commit below\n+'patch' (i.e. the patch below, or the stack base if this is the\n+bottom-most patch). Similarly '//top.old' and '//bottom.old'\n+refer to the previous version of the patch (before the last\n+stglink:push[] or stglink:refresh[] operation). When referring to the\n+current patch, its name can be omitted (eg. 'currentpatch//bottom.old'\n+can be abbreviated as 'bottom.old').\n+\n+If you need to pass a given StGIT reference to a git command,\n+stglink:id[] will convert it to a git commit id.\n+\n OPTIONS\n -------\n \n"},{"id":"41968","messageId":"20070512204352.GE28039@diana.vm.bytemark.co.uk","threadId":"8118","inReplyTo":"20070512185919.26101.3956.stgit@gandelf.nowhere.earth","subject":"Re: [StGIT PATCH v2] Document patch syntax.","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-05-12T20:43:52Z","receivedAt":"2007-05-12T20:43:52Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-05-12 20:59:30 +0200, Yann Dirson wrote:\n\n> Acked-by: Karl Hasselstr?m \n\nYour mail headers say\n\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: QUOTED-PRINTABLE\n\nbut the body contains\n\n Acked-by: Karl Hasselstr=F6m \n\nwhich is QP-encoded latin1, not utf8. (It's an illegal utf8 byte\nsequence, which is why it showed up as a question mark in my MUA.)\n\n> +Patches in the current stack are just refered to by their name. Some\n\ns/refered/referred/. I missed this the first time -- sorry.\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"},{"id":"42021","messageId":"20070513130354.GG16903@nan92-1-81-57-214-146.fbx.proxad.net","threadId":"8118","inReplyTo":"20070512204352.GE28039@diana.vm.bytemark.co.uk","subject":"Re: [StGIT PATCH v2] Document patch syntax.","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-05-13T13:03:54Z","receivedAt":"2007-05-13T13:03:54Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"On Sat, May 12, 2007 at 10:43:52PM +0200, Karl Hasselström wrote:\n> On 2007-05-12 20:59:30 +0200, Yann Dirson wrote:\n> \n> > Acked-by: Karl Hasselstr?m \n> \n> Your mail headers say\n> \n> Content-Type: text/plain; charset=utf-8\n> Content-Transfer-Encoding: QUOTED-PRINTABLE\n> \n> but the body contains\n> \n> Acked-by: Karl Hasselstr=F6m \n> \n> which is QP-encoded latin1, not utf8. (It's an illegal utf8 byte\n> sequence, which is why it showed up as a question mark in my MUA.)\n\nRight, I have seen that in gitk as well. My LC_CTYPE is \"french\",\nwhich is an iso8859-1 locale. I have not touched i18n.commitEncoding,\nwhich should then default to utf-8. Shouldn't a conversion to utf8\nhave happenned ? Things may be made different from standard git,\nsince this commit was handled by stgit - we may have something to fix\nhere :)\n\n\n> s/refered/referred/. I missed this the first time -- sorry.\n\nOK\n\nJeff wrote:\n>Karl's version is more correct (but your version might be used by many\n>native speakers). The second half of the sentence is correct because\n>'must' conjugates the same for singular and plural use; however, it\n>might be more clear to say \"...short name, each of which must be unique\n>in the stack.\"\n\nOK as well\n\nBest regards,\n-- \nYann.\n"},{"id":"42023","messageId":"20070513135805.GA8635@diana.vm.bytemark.co.uk","threadId":"8118","inReplyTo":"20070513130354.GG16903@nan92-1-81-57-214-146.fbx.proxad.net","subject":"Re: [StGIT PATCH v2] Document patch syntax.","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-05-13T13:58:05Z","receivedAt":"2007-05-13T13:58:05Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-05-13 15:03:54 +0200, Yann Dirson wrote:\n\n> My LC_CTYPE is \"french\", which is an iso8859-1 locale.\n\nI bit the bullet a year or so ago and switched over to a utf8 locale.\nIt's becoming increasingly hard to use non-utf8 locales: Gnome wants\nutf8, Ubuntu comes with only utf8 locales installed by default, etc. I\nfigured that it had become less work to convert than to stay with\nlatin1 (but I still have a few relics, such as the system I'm writing\nthis mail on).\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"}]}