guilt-select – Select guards to apply when pushing patches Synopsisguilt-select [ -n | –none | -s | –series | [–pop|–reapply] <guards…> ] DescriptionSelect guards to apply when pushing patches. Guards are selected without the + or – prefix. Patches are applied in the following way: * An unguarded patch is always applied.* A patch with…
guilt-rm – Remove a file from the git tree and guilt Synopsisguilt-rm <file>… DescriptionRemoves the files specified from git using git-rm Options<files> Files to addAuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> DocumentationDocumentation by Brandon Philips <m[blue]brandon [at] ifup.orgm[][2]> GuiltPart of the linkguilt:guilt[7] suite (Generated for Guilt v0.33) Notes 1. jeffpc [at] josefsipek.net mailto:jeffpc [at]…
guilt-repair – Repair the repository state Synopsisguilt-repair –full | –status DescriptionPerform various repository repairs. You must specify one mode of repair: –full Tries to repair everything possible. Additionally, it resets the repository state by reseting the HEAD to whatcqs believed to be the proper commit, and reseting the applied stack. The end result should be…
guilt-refresh – Refresh topmost applied patch Synopsisguilt-refresh [–git] [–diffstat] DescriptionRefresh topmost applied patch with changes in the working copy. Options–git Generate a patch which uses all the features offered by the git diff format (e.g., rename and copy detection). –diffstat Include a diffstat output in the patch file. Useful for cases where patches will be…
guilt-rebase – Rebase pushed patches Synopsisguilt-rebase <upstream> DescriptionRebase pushed patches against an upstream branch. Options<upstream> Branch, tag, or a commit hash identifying upstream repository history.ExamplesRebase current tree against Linuscqs 2.6 tree $ git-fetch git://git.kernel.org/pub/scm/linux/kernel/git/tovalds/linux-2.6.git $ guilt-rebase FETCH_HEADAuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> DocumentationDocumentation by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> GuiltPart of the…
guilt-push – Push patches onto the tree Synopsisguilt-push [ -f ] [-a | –all | -n <num> | <patchname>] Options-f Force the push if the patch doesncqt apply cleanly –all, -a Push all patches on the tree -n <num> Push specified number of patches <patchname> Push all patches up to and including this patch on…
guilt-prev – Output name of second topmost applied patch Synopsisguilt-prev [-p|–path] DescriptionOutput name of second topmost applied patch. If linkguilt:guilt-pop[1] is used, this patch will become the topmost patch. Options-p, –path Output full path instead of just patch name.AuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> DocumentationDocumentation by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> GuiltPart…
guilt-pop – Pop patches from the tree Synopsisguilt-pop [-f] [-a | –all | -n <num> | <patchname>] Options–all, -a Pop all patches off the tree -f Force; discards any unrefreshed changes -n <num> Push specified number of patches <patchname> Pop all patches up to and including this patch off the tree If no patchname is…
guilt-patchbomb – Email a series of commits interactively Synopsisguilt-patchbomb [-n] [–in-reply-to <msgid>] [–git] [<hash> | <since>..[<until>] | ..<until>] DescriptionSend a series of commits via email asking for To, CC and other information interactively. Options-n Doncqt send –in-reply-to <msgid> Set the In-reply-to header to the specified message id. This allows the patches to be sent as…
guilt-next – Output the name of next patch to be pushed Synopsisguilt-next [-p|–path] DescriptionOutput the name of next patch to be pushed. If linkguilt:guilt-push[1] is issued, this patch would be the topmost patch. Options-p, –path Output full path instead of just patch name.AuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> DocumentationDocumentation by Josef "Jeff" Sipek…
guilt-new – Create a new patch Synopsisguilt-new [-f] [-s] [-e|-m message] <patchname> DescriptionCreate a new patch and push it on top of the stack. An optional patch description can be supplied either interactively on via the command line. Options-f Force patch creation if there are unrefreshed changes. These changes will get automatically imported into the…
guilt-init – Initialize guilt for use in a git repository Synopsisguilt-init DescriptionInitialize a git repository for use with guilt ExamplesFirst, get a repository to work on. Herecqs one that wecqll use as an example: $ git-clone git://git.kernel.org/pub/scm/linux/kernel/jsipek/guilt-hello.git Now, it initialize the patches directory using guiltcqs init command: $ cd hello $ guilt-initAuthorWritten by Josef "Jeff"…
guilt-import – Import specified patch file Synopsisguilt-import [-P <patch> ] <patch_file> DescriptionImport a specified patch file into the series, placing it after the current topmost patch. Options-P <patch> Name of the patch within Guilt. <patch_file> Name of the file to be imported into the series.AuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> DocumentationDocumentation by Josef…
guilt-import-commit – Import one or more commits as patches Synopsisguilt-import-commit [<hash> | <since>..[<until>] | ..<until>] DescriptionImport one or more commits as individual patches. Options<hash> Only the specified revision. <since>..[<until>] Revisions starting from <since> until <until>. The <since> revision it self is NOT included, while <until> is. If <until> is not specified, it is assumed to…
guilt-help – open man page of a guilt command Synopsisguilt-help [<command> | <topic>] DescriptionOpen up the man page for a guilt command. ExamplesOpen the guilt-status man page $ guilt-help status Open the guilt man page $ guilt-helpAuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> DocumentationDocumentation by Brandon Philips <m[blue]brandon [at] ifup.orgm[][2]> GuiltPart of the linkguilt:guilt[7]…
guilt-header – Print a patch header Synopsisguilt-header [-eE] [<patchname>] DescriptionPrints either the topmost patchcqs header or the header of a specified patch. -e Open the header in an editor, instead of printing it. -E Open the raw patch in an editor, instead of printing it. <patchname> Name of the patch.AuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc…
guilt-guard – Assign guards to patches Synopsisguilt-guard [-l | –list | -n | –none | [<patchname>] [(+|-)<guard>…]] DescriptionAssign guards to the specified patch, or to the patch on top of the stack if no patch is given on the command line. An unguarded patch is always pushed. A positive guard begins with a +. A…
guilt-graph – Create a patch dependency graph Synopsisguilt-graph [<patchname>] DescriptionCreate a dot(1) directed graph showing the dependencies between applied patches. Options<patchname> Instead of starting with the topmost applied patch, start with <patchname>.AuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> DocumentationDocumentation by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> GuiltPart of the linkguilt:guilt[7] suite (Generated for Guilt…
guilt-fork – Fork the topmost applied patch Synopsisguilt-fork [<new_name>] DescriptionCreate a copy of the top most patch, and replace the entry in the series file to use this new patch file. Options<new_name> The name of the new patch to create.AuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]> DocumentationDocumentation by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]>…
guilt-fold – Fold a specified patch into the topmost applied patch Synopsisguilt-fold [-k] <patchname> Options-k Do not remove the patch file. <patchname> Fold this patch into the topmost applied patch. patchname is removed from the series, as well as from the patches directory. (A backup file is created.)AuthorWritten by Josef "Jeff" Sipek <m[blue]jeffpc [at] josefsipek.netm[][1]>…