.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. .de Ve \" End verbatim text .ft R .fi .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left .\" double quote, and \*(R" will give a right double quote. \*(C+ will .\" give a nicer C++. Capital omega is used to do unbreakable dashes and .\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, .\" nothing in troff, for use with C<>. .tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- . ds PI pi . if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch . if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch . ds L" "" . ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ . ds -- \|\(em\| . ds PI \(*p . ds L" `` . ds R" '' . ds C` . ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" .\" If the F register is >0, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .\" .\" Avoid warning from groff about undefined register 'F'. .de IX .. .nr rF 0 .if \n(.g .if rF .nr rF 1 .if (\n(rF:(\n(.g==0)) \{\ . if \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . if !\nF==2 \{\ . nr % 0 . nr F 2 . \} . \} .\} .rr rF .\" ======================================================================== .\" .IX Title "App::Pinto::Command::merge 3pm" .TH App::Pinto::Command::merge 3pm "2022-10-16" "perl v5.34.0" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" App::Pinto::Command::merge \- join two stack histories together .SH "VERSION" .IX Header "VERSION" version 0.14 .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 1 \& pinto \-\-root=REPOSITORY_ROOT merge [OPTIONS] STACK [INTO_STACK] .Ve .SH "DESCRIPTION" .IX Header "DESCRIPTION" !! \s-1THIS COMMAND IS EXPERIMENTAL\s0 !! .PP This command joins the history of one stack with another. At present, it is only capable of doing a \*(L"fast-forward\*(R" merge when the head of \s-1STACK\s0 is a direct descendant of the head of \s-1INTO_STACK.\s0 .SH "COMMAND ARGUMENTS" .IX Header "COMMAND ARGUMENTS" The first mandatory argument is the name of the stack to merge from. The second optional argument is the name of the stack to merge to. If the second argument is not specified, it defaults to whichever stack is currently marked as the default. Here are some examples: .PP .Vb 2 \& pinto ... merge dev # Merge the "dev" stack into the default stack \& pinto ... merge dev prod # Merge the "dev" stack into the "prod" stack .Ve .SH "COMMAND OPTIONS" .IX Header "COMMAND OPTIONS" .IP "\-\-dry\-run" 4 .IX Item "--dry-run" Go through all the motions, but do not actually commit any changes to the repository. At the conclusion, a diff showing the changes that would have been made will be displayed. Use this option to see how upgrades would potentially impact the stack. .IP "\-\-message=TEXT" 4 .IX Item "--message=TEXT" .PD 0 .IP "\-m \s-1TEXT\s0" 4 .IX Item "-m TEXT" .PD Use \s-1TEXT\s0 as the revision history log message. If you do not use the \&\f(CW\*(C`\-\-message\*(C'\fR option or the \f(CW\*(C`\-\-use\-default\-message\*(C'\fR option, then you will be prompted to enter the message via your text editor. Use the \f(CW\*(C`PINTO_EDITOR\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR or \f(CW\*(C`VISUAL\*(C'\fR environment variables to control which editor is used. A log message is not required whenever the \f(CW\*(C`\-\-dry\-run\*(C'\fR option is set, or if the action did not yield any changes to the repository. .IP "\-\-use\-default\-message" 4 .IX Item "--use-default-message" .PD 0 .IP "\-M" 4 .IX Item "-M" .PD Use the default value for the revision history log message. Pinto will generate a semi-informative log message just based on the command and its arguments. If you set an explicit message with \f(CW\*(C`\-\-message\*(C'\fR, the \f(CW\*(C`\-\-use\- default\-message\*(C'\fR option will be silently ignored. .SH "AUTHOR" .IX Header "AUTHOR" Jeffrey Ryan Thalhammer .SH "COPYRIGHT AND LICENSE" .IX Header "COPYRIGHT AND LICENSE" This software is copyright (c) 2015 by Jeffrey Ryan Thalhammer. .PP This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself.