STG-SHOW(1) StGit Manual STG-SHOW(1)NAME
stg-show - Show the commit corresponding to a patch
SYNOPSIS
stg show [options] [<patch1>] [<patch2>] [<patch3>..<patch4>]
DESCRIPTION
Show the commit log and the diff corresponding to the given patches. The output is similar to that generated by git show.
OPTIONS -b BRANCH, --branch BRANCH
Use BRANCH instead of the default branch.
-a, --applied
Show the applied patches.
-u, --unapplied
Show the unapplied patches.
-s, --stat
Show a diffstat summary of the specified patches.
-O OPTIONS, --diff-opts OPTIONS
Extra options to pass to "git diff".
STGIT
Part of the StGit suite - see linkman:stg[1]
StGit 03/13/2012 STG-SHOW(1)
Check Out this Related Man Page
STG-REPAIR(1) StGit Manual STG-REPAIR(1)NAME
stg-repair - Fix StGit metadata if branch was modified with git commands
SYNOPSIS
stg repair
DESCRIPTION
If you modify an StGit stack (branch) with some git commands -- such as commit, pull, merge, and rebase -- you will leave the StGit
metadata in an inconsistent state. In that situation, you have two options:
1. Use "stg undo" to undo the effect of the git commands. (If you know what you are doing and want more control, "git reset" or similar
will work too.)
2. Use "stg repair". This will fix up the StGit metadata to accomodate the modifications to the branch. Specifically, it will do the
following:
o If you have made regular git commits on top of your stack of StGit patches, "stg repair" makes new StGit patches out of them,
preserving their contents.
o However, merge commits cannot become patches; if you have committed a merge on top of your stack, "repair" will simply mark all
patches below the merge unapplied, since they are no longer reachable. If this is not what you want, use "stg undo" to get rid of
the merge and run "stg repair" again.
o The applied patches are supposed to be precisely those that are reachable from the branch head. If you have used e.g. "git reset"
to move the head, some applied patches may no longer be reachable, and some unapplied patches may have become reachable. "stg
repair" will correct the appliedness of such patches.
"stg repair" will fix these inconsistencies reliably, so as long
as you like what it does, you have no reason to avoid causing
them in the first place. For example, you might find it
convenient to make commits with a graphical tool and then have
"stg repair" make proper patches of the commits.
Note
If using git commands on the stack was a mistake, running "stg repair" is not what you want. In that case, what you want is option (1)
above.
STGIT
Part of the StGit suite - see linkman:stg[1]
StGit 03/13/2012 STG-REPAIR(1)
I have a huge matrix file containing some 1.5 million rows and 6000 columns. The matrix looks something like this:
1 2 3
4 5 6
7 8 9
3 4 5
I want to add all the numbers in the columns of this matrix and display the result to my stdout. This means that the numbers in the first column are:
... (2 Replies)
Hi,
Just trying to get to grips with sed and awk for some reporting for work and I need some assistance:
I have a file that lists policy names on the first line and then on the second line whether the policy is active or not.
Policy Name: Policy1
Active: yes
Policy... (8 Replies)
version info :
vi availabe with RHEL 5.4
I have a text file with 10,000 lines. I want to copy lines from 5000th line to 7000th and redirect to a file. Any idea how I can do this?
Note:
The above scenario is just an example. In my actual requirement, the file has 14 million lines and I want... (9 Replies)
Hi everyone,
I know the following questions are noobish questions but I am asking them because I am confused about the basics of history behind UNIX and LINUX.
Ok onto business, my questions are-:
Was/Is UNIX ever an open source operating system ?
If UNIX was... (21 Replies)
Hello,
I couldn't find an actual introduction thread, so I decided to just put this here.
I go by d0wngrade online. I have been programming in multiple languages for about 15+ years. I started with standard web design languages like HTML and CSS, but I then advanced from design to development... (2 Replies)
Hi guys...
The first active code line in AudioScope.sh is set -u .
This causes a complete exit if a variable is used/found but has not been allocated at the start of the program.
However, apart from writing code to do the task, is there a switch to to check which variables have been... (17 Replies)
Hi.
In thread https://www.unix.com/shell-programming-and-scripting/267833-grouping-counting.html rovf and I had a mini-discussion on grep and awk.
Here is a demo script that compares the awk and grep approaches for this single problem:
#!/usr/bin/env bash
# @(#) s2 Demonstrate group... (1 Reply)
Hello,
I have to fish out some specific columns from a file based on the header value. I have the list of columns I need in a different file. I thought I could read in the list of headers I need,
# file with header names of required columns in required order
headers_file=$2
# read contents... (11 Replies)
For those interested in installing dash shell on OSX Lion to help test POSIX compliancy of shell scripts, it is quite easy. I did it like this:
If you don't have gcc on your system:
0. Download and install the Command Line Tools for Xcode package from Sign In - Apple *
1. Download the dash... (2 Replies)
Hello and thanks in advance for any help anyone can offer me
I'm trying to learn the find command and thought I was understanding it... Apparently I was wrong. I was doing compound searches and I started getting weird results with the -size test. I was trying to do a search on a 1G file owned by... (14 Replies)
I have data of an excel files as given below,
file1
org1_1 1 1 2.5 100
org1_2 1 2 5.5 98
org1_3 1 3 7.2 88
file2
org2_1 1 1 2.5 100
org2_2 1 2 5.5 56
org2_3 1 3 7.2 70
I have multiple excel files as above shown.
I have to copy column 1, column 4 and paste into a new excel file as... (26 Replies)
Dear All,
Taking a break from Vue.js coding for the site, SEO and YT videos; and hopefully addressing some well deserved criticism from some here that I have been too focused on the visual aspects of the forums versus the substance and the community....
While the "current generation... (9 Replies)
Hi all...
Well guys and gals, I jumped in at the deep end and found things that PERL cannot do by default.
Many tricky terminal escape codes are not catered for so I had to create workarounds.
One thing I searched for was this:
Passing perl variable to shell command
AND, @Neo this was... (15 Replies)