STG-PUSH(1) StGit Manual STG-PUSH(1)NAME
stg-push - Push one or more patches onto the stack
SYNOPSIS
stg push [options] [<patch1>] [<patch2>] [<patch3>..<patch4>]
DESCRIPTION
Push one or more patches (defaulting to the first unapplied one) onto the stack. The push operation allows patch reordering by commuting
them with the three-way merge algorithm. If there are conflicts while pushing a patch, those conflicts are written to the work tree, and
the command halts. Conflicts raised during the push operation have to be fixed and the git add --update command run (alternatively, you may
undo the conflicting push with stg undo).
The command also notifies when the patch becomes empty (fully merged upstream) or is modified (three-way merged) by the push operation.
OPTIONS -a, --all
Push all the unapplied patches.
-n NUMBER, --number NUMBER
Push the specified number of patches.
--reverse
Push the patches in reverse order.
--set-tree
Push the patches, but don't perform a merge. Instead, the resulting tree will be identical to the tree that the patch previously
created.
This can be useful when splitting a patch by first popping the patch and creating a new patch with some of the changes. Pushing the
original patch with --set-tree will avoid conflicts and only the remaining changes will be in the patch.
-k, --keep
Keep the local changes.
-m, --merged
Check for patches merged upstream.
STGIT
Part of the StGit suite - see linkman:stg[1]
StGit 03/13/2012 STG-PUSH(1)
Check Out this Related Man Page
STG-SQUASH(1) StGit Manual STG-SQUASH(1)NAME
stg-squash - Squash two or more patches into one
SYNOPSIS
stg squash [options] <patches>
DESCRIPTION
Squash two or more patches, creating one big patch that contains all their changes. In more detail:
1. Pop all the given patches, plus any other patches on top of them.
2. Push the given patches in the order they were given on the command line.
3. Squash the given patches into one big patch.
4. Allow the user to edit the commit message of the new patch interactively.
5. Push the other patches that were popped in step (1).
Conflicts can occur whenever we push a patch; that is, in step (2) and (5). If there are conflicts, the command will stop so that you can
resolve them.
OPTIONS -n NAME, --name NAME
Name of squashed patch.
-m MESSAGE, --message MESSAGE
Use MESSAGE instead of invoking the editor.
-f FILE, --file FILE
Use the contents of FILE instead of invoking the editor. (If FILE is "-", write to stdout.)
--save-template FILE
Instead of running the command, just write the message template to FILE, and exit. (If FILE is "-", write to stdout.)
When driving StGit from another program, it is often useful to first call a command with --save-template, then let the user edit the
message, and then call the same command with --file.
STGIT
Part of the StGit suite - see linkman:stg[1]
StGit 03/13/2012 STG-SQUASH(1)
Hello,
in windows update you get the latest patches
in your system, in solaris is such an option?
by downloading patches in unix comes with tar.z
in windows winzip, adobe etc helps you to unzip
uncompres the files
in solaris can anyone remind me what is the
apropriate command or program... (3 Replies)
i'm trying to run Patch Manager, but i'm getting the following problem when i try and run "pprosvc" with either the -l, -d, or -i options.
Assessing patches needed for your system...... (8 Replies)
I am having trouble installing some HPUX patches on my B1000 11.11. I am a novice
at this so bear with me. I understand how to install depots. Very easy.
Now I'm trying to patch my system so I can get the Oracle client installed.
Oracle says I need these two patches: PHCO_23770, PHCO_23092
I... (4 Replies)
I'm attempting to install a Sun patch and keep getting an error:
# patchadd /tmp/patches/110722-03
Checking installed patches...
One or more patch packages included in
110722-03 are not installed on this system.
Patchadd is terminating.
#
How can I find out what are the "One or... (7 Replies)
I am seeking help to add patches to Solaris 10 on 64 bit Sparc server. This is to prepare the server for the installation of Oracle 10g. Please list command and specific directory that patches should be added to. Thanks (4 Replies)
I am seeking help to add patches to Sloris 10 on 64 bit Sparc server. This is to prepare the server for the installation of oracle 10g. Please list command and the directory (If needed). Thanks. (7 Replies)
Hello,
Firstable I am new on hp-ux (well long time ago) I am more aix admin....
Legato networker is the tool backup use on the hp-ux. I don't know this tool and would like to know where to find some docs or training.
My first question will be : when a system (hp-ux B.11.0) is backuped on a... (8 Replies)
Hi, I have a Ultra5 440MHz system running Solaris 2.6 (Rev 5.6) and have a problem with the keyboard. When I push a key it prints characters very quickly. If I push a key very fast I get maybe 3 characters.
So, I am thinking bad keyboard. I borrow a known good keyboard, samething and the... (3 Replies)
Hi All,
I need to update my solaris with a particular patch. When reading the instruction on the sun web site, I got this:
Installation Requirements:
Reboot immediately after installing this patch on an active boot environment to bring the system to a consistent state. An alternative may... (8 Replies)
Hi All,
I would like to ask some questions, I have an Solaris 10 and RHEL which is install in separate machine..
The question is:
1. how can I check the latest patches or latest update in my machine? (I need a step or command)
2. where can I get the latest security patch or necessary patch... (5 Replies)
# patchadd /Desktop/117837-08.jar
Validating patches...
Loading patches installed on the system...
Done!
Loading patches requested to install.
Done!
The following requested patches have packages not installed on the system
Package SPROcc from directory SPROcc in patch 117837-08 is... (19 Replies)
Hello,
The 10_Recommended update failed on 3 of 191, which was patch 119254-73 (the 1st 2 patches were skipped). I looked up the patch on Sunsolve (http://sunsolve.sun.com/search/document.do?assetkey=1-21-119254), which stated that 121133-02 was a required patch for 119254-73. I did a "showrev... (7 Replies)
Hi,
I have a file with th elist of patches separated by comma, like below:
patch1, patch 2, patch 3................
t\The number of patches is not known as it changes every time.
I need assistance in writing a routine such as it will take patch1 as first variable and performs the... (4 Replies)