1 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.5.2" />
7 <title>guilt(
7)
</title>
8 <style type=
"text/css">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.5em;
116 margin-bottom: 1.5em;
118 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
119 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
120 div
.admonitionblock
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.0em;
131 div
.content
{ /* Block element content. */
135 /* Block element titles. */
136 div
.title
, caption
.title
{
138 font-family: sans-serif
;
142 margin-bottom: 0.5em;
148 td div
.title:first-child
{
151 div
.content div
.title:first-child
{
154 div
.content
+ div
.title
{
158 div
.sidebarblock
> div
.content
{
160 border: 1px solid silver
;
164 div
.listingblock
> div
.content
{
165 border: 1px solid silver
;
170 div
.quoteblock
, div
.verseblock
{
174 border-left: 5px solid
#dddddd;
178 div
.quoteblock
> div
.attribution
{
183 div
.verseblock
> div
.content
{
186 div
.verseblock
> div
.attribution
{
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 div
.verseblock
+ div
.attribution
{
195 div
.admonitionblock
.icon
{
199 text-decoration: underline
;
201 padding-right: 0.5em;
203 div
.admonitionblock td
.content
{
205 border-left: 3px solid
#dddddd;
208 div
.exampleblock
> div
.content
{
209 border-left: 3px solid
#dddddd;
213 div
.imageblock div
.content
{ padding-left: 0; }
214 span
.image img
{ border-style: none
; }
215 a
.image:visited
{ color: white
; }
219 margin-bottom: 0.8em;
232 list-style-position: outside
;
235 list-style-type: decimal
;
238 list-style-type: lower-alpha
;
241 list-style-type: upper-alpha
;
244 list-style-type: lower-roman
;
247 list-style-type: upper-roman
;
250 div
.compact ul
, div
.compact ol
,
251 div
.compact p
, div
.compact p
,
252 div
.compact div
, div
.compact div
{
254 margin-bottom: 0.1em;
257 div
.tableblock
> table
{
258 border: 3px solid
#527bbd;
260 thead
, p
.table
.header
{
261 font-family: sans-serif
;
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 div
.tableblock
> table
[frame
="void"] {
277 div
.tableblock
> table
[frame
="hsides"] {
278 border-left-style: none
;
279 border-right-style: none
;
281 div
.tableblock
> table
[frame
="vsides"] {
282 border-top-style: none
;
283 border-bottom-style: none
;
289 margin-bottom: 0.8em;
292 padding-bottom: 15px;
294 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
300 padding-right: 0.8em;
306 div
.hdlist
.compact tr
{
315 .footnote, .footnoteref {
319 span
.footnote
, span
.footnoteref
{
320 vertical-align: super
;
324 margin: 20px 0 20px 0;
328 #footnotes div
.footnote
{
334 border-top: 1px solid silver
;
344 div#footer-badges
{ display: none
; }
348 margin-bottom: 2.5em;
353 font-family: sans-serif
;
357 margin-bottom: 0.1em;
360 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
376 /* Overrides for manpage documents */
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver
;
381 border-bottom: 2px solid silver
;
391 div#toc
{ display: none
; }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
396 div
.sidebar-content
{
398 border: 1px solid silver
;
401 div
.sidebar-title
, div
.image-title
{
403 font-family: sans-serif
;
406 margin-bottom: 0.5em;
409 div
.listingblock div
.content
{
410 border: 1px solid silver
;
415 div
.quoteblock-attribution
{
420 div
.verseblock-content
{
423 div
.verseblock-attribution
{
428 div
.exampleblock-content
{
429 border-left: 3px solid
#dddddd;
433 /* IE6 sets dynamically generated links as visited. */
434 div#toc
a:visited
{ color: blue
; }
436 <script type=
"text/javascript">
438 window
.onload = function(){asciidoc
.footnotes();}
439 var asciidoc
= { // Namespace.
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
448 * Table Of Content generator
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
459 toc: function (toclevels
) {
461 function getText(el
) {
463 for (var i
= el
.firstChild
; i
!= null; i
= i
.nextSibling
) {
464 if (i
.nodeType
== 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
466 else if (i
.firstChild
!= null)
472 function TocEntry(el
, text
, toclevel
) {
475 this.toclevel
= toclevel
;
478 function tocEntries(el
, toclevels
) {
479 var result
= new Array
;
480 var re
= new RegExp('[hH]([2-'+(toclevels
+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
484 var iterate = function (el
) {
485 for (var i
= el
.firstChild
; i
!= null; i
= i
.nextSibling
) {
486 if (i
.nodeType
== 1 /* Node.ELEMENT_NODE */) {
487 var mo
= re
.exec(i
.tagName
);
488 if (mo
&& (i
.getAttribute("class") || i
.getAttribute("className")) != "float") {
489 result
[result
.length
] = new TocEntry(i
, getText(i
), mo
[1]-1);
499 var toc
= document
.getElementById("toc");
500 var entries
= tocEntries(document
.getElementById("content"), toclevels
);
501 for (var i
= 0; i
< entries
.length
; ++i
) {
502 var entry
= entries
[i
];
503 if (entry
.element
.id
== "")
504 entry
.element
.id
= "_toc_" + i
;
505 var a
= document
.createElement("a");
506 a
.href
= "#" + entry
.element
.id
;
507 a
.appendChild(document
.createTextNode(entry
.text
));
508 var div
= document
.createElement("div");
510 div
.className
= "toclevel" + entry
.toclevel
;
511 toc
.appendChild(div
);
513 if (entries
.length
== 0)
514 toc
.parentNode
.removeChild(toc
);
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
526 footnotes: function () {
527 var cont
= document
.getElementById("content");
528 var noteholder
= document
.getElementById("footnotes");
529 var spans
= cont
.getElementsByTagName("span");
532 for (i
=0; i
<spans
.length
; i
++) {
533 if (spans
[i
].className
== "footnote") {
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note
= spans
[i
].innerHTML
.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder
.innerHTML
+=
539 "<div class='footnote' id='_footnote_" + n
+ "'>" +
540 "<a href='#_footnoteref_" + n
+ "' title='Return to text'>" +
541 n
+ "</a>. " + note
+ "</div>";
543 "[<a id='_footnoteref_" + n
+ "' href='#_footnote_" + n
+
544 "' title='View footnote' class='footnote'>" + n
+ "</a>]";
545 var id
=spans
[i
].getAttribute("id");
546 if (id
!= null) refs
["#"+id
] = n
;
550 noteholder
.parentNode
.removeChild(noteholder
);
552 // Process footnoterefs.
553 for (i
=0; i
<spans
.length
; i
++) {
554 if (spans
[i
].className
== "footnoteref") {
555 var href
= spans
[i
].getElementsByTagName("a")[0].getAttribute("href");
556 href
= href
.match(/#.*/)[0]; // Because IE return full URL.
559 "[<a href='#_footnote_" + n
+
560 "' title='View footnote' class='footnote'>" + n
+ "</a>]";
576 <div class=
"sectionbody">
583 <h2 id=
"_synopsis">SYNOPSIS
</h2>
584 <div class=
"sectionbody">
585 <div class=
"paragraph"><p><em>guilt
</em> COMMAND [ARGS]
</p></div>
587 <h2 id=
"_description">DESCRIPTION
</h2>
588 <div class=
"sectionbody">
589 <div class=
"paragraph"><p>Andrew Morton originally developed a set of scripts for maintaining kernel
590 patches outside of any SCM tool. Others extended these into a suite called
591 quilt. The basic idea behind quilt is to maintain patches instead of
592 maintaining source files. Patches can be added, removed or reordered, and
593 they can be refreshed as you fix bugs or update to a new base revision.
594 quilt is very powerful, but it is not integrated with the underlying SCM
595 tools. This makes it difficult to visualize your changes.
</p></div>
596 <div class=
"paragraph"><p>Guilt allows one to use quilt functionality on top of a Git repository.
597 Changes are maintained as patches which are committed into Git. Commits can
598 be removed or reordered, and the underlying patch can be refreshed based on
599 changes made in the working directory. The patch directory can also be
600 placed under revision control, so you can have a separate history of changes
601 made to your patches.
</p></div>
603 <h2 id=
"_patches_directory">PATCHES DIRECTORY
</h2>
604 <div class=
"sectionbody">
605 <div class=
"paragraph"><p>In Guilt, all the patches are stored in .git/patches/$branch/, where $branch
606 is the name of the branch being worked on. This means that one can have a
607 independent series of patches for each branch present in the repository.
608 Each of these per-branch directories contains
3 special files:
</p></div>
609 <div class=
"paragraph"><p>guards: This file contains any guards that should be applied to the
610 series when pushing. It is only present when guards are selected.
</p></div>
611 <div class=
"paragraph"><p>series: This file contains a list of all the patch filenames relative to the
612 per-branch patch directory. Empty and commented out lines are ignored.
</p></div>
613 <div class=
"paragraph"><p>status: This file contains the state of the stack. What patches are applied.
</p></div>
615 <h2 id=
"_hooks">HOOKS
</h2>
616 <div class=
"sectionbody">
617 <div class=
"paragraph"><p>Any guilt operation may execute zero or more hook scripts which can be used
618 to run any housekeeping commands or even abort the execution of the command.
</p></div>
620 <h2 id=
"_hooks_directory">HOOKS DIRECTORY
</h2>
621 <div class=
"sectionbody">
622 <div class=
"paragraph"><p>Guilt follows the same basic design of hooks in Git itself. All Guilt hooks
623 are executable files (generally shell scripts, but they can be anything the
624 operating system can execute) in .git/hooks/guilt/.
</p></div>
625 <div class=
"paragraph"><p>The following hooks are supported:
</p></div>
626 <div class=
"dlist"><dl>
628 delete
<patch name
>
632 Executed when a patch is deleted from the patch series via
633 linkguilt:guilt-delete[
1].
638 <h2 id=
"_guilt_commands">GUILT COMMANDS
</h2>
639 <div class=
"sectionbody">
640 <div class=
"paragraph"><p>All commands can be called with or without a dash. e.g.
<em>guilt add
</em> or
641 <em>guilt-add
</em></p></div>
642 <div class=
"dlist"><dl>
644 linkguilt:guilt-add[
1]
648 guilt-add - Add a file to git and guilt.
652 linkguilt:guilt-applied[
1]
656 guilt-applied - List applied patches.
660 linkguilt:guilt-branch[
1]
664 guilt-branch - Branch the entire patch series.
668 linkguilt:guilt-commit[
1]
672 guilt-commit - Commit specified number of patches.
676 linkguilt:guilt-delete[
1]
680 guilt-delete - Delete a patch.
684 linkguilt:guilt-diff[
1]
688 guilt-diff - Outputs various diffs.
692 linkguilt:guilt-export[
1]
696 guilt-export - Export a patch series (to be used by quilt).
700 linkguilt:guilt-files[
1]
704 guilt-files - Print the list of files that the topmost patch changes.
708 linkguilt:guilt-fold[
1]
712 guilt-fold - Fold a specified patch into the topmost applied patch.
716 linkguilt:guilt-fork[
1]
720 guilt-fork - Fork the topmost applied patch.
724 linkguilt:guilt-graph[
1]
728 guilt-graph - Create a patch dependency graph.
732 linkguilt:guilt-guard[
1]
736 guilt-guard - Assign guards to patches.
740 linkguilt:guilt-header[
1]
744 guilt-header - Print a patch header.
748 linkguilt:guilt-help[
1]
752 guilt-help - open man page of a guilt command.
756 linkguilt:guilt-import-commit[
1]
760 guilt-import-commit - Import one or more commits as patches.
764 linkguilt:guilt-import[
1]
768 guilt-import - Import specified patch file.
772 linkguilt:guilt-init[
1]
776 guilt-init - Initialize guilt for use in a git repository.
780 linkguilt:guilt-new[
1]
784 guilt-new - Create a new patch.
788 linkguilt:guilt-next[
1]
792 guilt-next - Output the name of next patch to be pushed.
796 linkguilt:guilt-patchbomb[
1]
800 guilt-patchbomb - Email a series of commits interactively.
804 linkguilt:guilt-pop[
1]
808 guilt-pop - Pop patches from the tree.
812 linkguilt:guilt-prev[
1]
816 guilt-prev - Output name of second topmost applied patch.
820 linkguilt:guilt-push[
1]
824 guilt-push - Push patches onto the tree.
828 linkguilt:guilt-rebase[
1]
832 guilt-rebase - Rebase pushed patches.
836 linkguilt:guilt-refresh[
1]
840 guilt-refresh - Refresh topmost applied patch.
844 linkguilt:guilt-repair[
1]
848 guilt-repair - Repair the repository state.
852 linkguilt:guilt-rm[
1]
856 guilt-rm - Remove a file from the git tree and guilt.
860 linkguilt:guilt-select[
1]
864 guilt-select - Select guards to apply when pushing patches.
868 linkguilt:guilt-series[
1]
872 guilt-series - Print the stack of patches.
876 linkguilt:guilt-status[
1]
880 guilt-status - Print the status of files since the last refresh.
884 linkguilt:guilt-top[
1]
888 guilt-top - Output name of topmost applied patch.
892 linkguilt:guilt-unapplied[
1]
896 guilt-unapplied - List all unapplied patches.
901 <h2 id=
"_author">Author
</h2>
902 <div class=
"sectionbody">
903 <div class=
"paragraph"><p>Written by Josef
"Jeff" Sipek
<<a href=
"mailto:jeffpc@josefsipek.net">jeffpc@josefsipek.net
</a>></p></div>
905 <h2 id=
"_documentation">Documentation
</h2>
906 <div class=
"sectionbody">
907 <div class=
"paragraph"><p>Documentation by Brandon Philips
<<a href=
"mailto:brandon@ifup.org">brandon@ifup.org
</a>> and Josef
"Jeff" Sipek
908 <<a href=
"mailto:jeffpc@josefsipek.net">jeffpc@josefsipek.net
</a>></p></div>
910 <h2 id=
"_guilt">GUILT
</h2>
911 <div class=
"sectionbody">
912 <div class=
"paragraph"><p>Part of the linkguilt:guilt[
7] suite
913 (Generated for Guilt v0.33)
</p></div>
916 <div id=
"footnotes"><hr /></div>
918 <div id=
"footer-text">
919 Last updated
2010-
04-
15 22:
51:
05 EDT