stg-refresh(1) [debian man page]

STG-REFRESH(1)							   StGit Manual 						    STG-REFRESH(1)

NAME

       stg-refresh - Generate a new commit for the current patch

SYNOPSIS

       stg refresh [options] [<files or dirs>]

DESCRIPTION

       Include the latest work tree and index changes in the current patch. This command generates a new git commit object for the patch; the old
       commit is no longer visible.

       You may optionally list one or more files or directories relative to the current working directory; if you do, only matching files will be
       updated.

       Behind the scenes, stg refresh first creates a new temporary patch with your updates, and then merges that patch into the patch you asked
       to have refreshed. If you asked to refresh a patch other than the topmost patch, there can be conflicts; in that case, the temporary patch
       will be left for you to take care of, for example with stg squash.

       The creation of the temporary patch is recorded in a separate entry in the patch stack log; this means that one undo step will undo the
       merge between the other patch and the temp patch, and two undo steps will additionally get rid of the temp patch.

OPTIONS

       -u, --update
	   Only update the current patch files.

       -i, --index
	   Instead of setting the patch top to the current contents of the worktree, set it to the current contents of the index.

       -p PATCH, --patch PATCH
	   Refresh (applied) PATCH instead of the top patch.

       -e, --edit
	   Invoke an editor for the patch description.

       -a NOTE, --annotate NOTE
	   Annotate the patch log entry.

       -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.)

       --sign
	   Add a "Signed-off-by:" to the end of the patch.

       --ack
	   Add an "Acked-by:" line to the end of the patch.

       --author "NAME <EMAIL>"
	   Set the author details.

       --authname NAME
	   Set the author name.

       --authemail EMAIL
	   Set the author email.

       --authdate DATE
	   Set the author date.

STGIT

       Part of the StGit suite - see linkman:stg[1]

StGit								    03/13/2012							    STG-REFRESH(1)

STG-IMPORT(1)							   StGit Manual 						     STG-IMPORT(1)

NAME

       stg-import - Import a GNU diff file as a new patch

SYNOPSIS

       stg import [options] [<file>|<url>]

DESCRIPTION

       Create a new patch and apply the given GNU diff file (or the standard input). By default, the file name is used as the patch name but this
       can be overridden with the --name option. The patch can either be a normal file with the description at the top or it can have standard
       mail format, the Subject, From and Date headers being used for generating the patch information. The command can also read series and mbox
       files.

       If a patch does not apply cleanly, the failed diff is written to the .stgit-failed.patch file and an empty StGIT patch is added to the
       stack.

       The patch description has to be separated from the data with a --- line.

OPTIONS

       -m, --mail
	   Import the patch from a standard e-mail file.

       -M, --mbox
	   Import a series of patches from an mbox file.

       -s, --series
	   Import a series of patches from a series file or a tar archive.

       -u, --url
	   Import a patch from a URL.

       -n NAME, --name NAME
	   Use NAME as the patch name.

       -p N, --strip N
	   Remove N leading slashes from diff paths (default 1).

       -t, --stripname
	   Strip numbering and extension from patch name.

       -i, --ignore
	   Ignore the applied patches in the series.

       --replace
	   Replace the unapplied patches in the series.

       -b BASE, --base BASE
	   Use BASE instead of HEAD for file importing.

       --reject
	   Leave the rejected hunks in corresponding *.rej files.

       -e, --edit
	   Invoke an editor for the patch description.

       -d, --showdiff
	   Show the patch content in the editor buffer.

       -a "NAME <EMAIL>", --author "NAME <EMAIL>"
	   Use "NAME <EMAIL>" as the author details.

       --authname AUTHNAME
	   Use AUTHNAME as the author name.

       --authemail AUTHEMAIL
	   Use AUTHEMAIL as the author e-mail.

       --authdate AUTHDATE
	   Use AUTHDATE as the author date.

       --sign
	   Add a "Signed-off-by:" to the end of the patch.

       --ack
	   Add an "Acked-by:" line to the end of the patch.

STGIT

       Part of the StGit suite - see linkman:stg[1]

StGit								    03/13/2012							     STG-IMPORT(1)