SYNOPSIS

guilt COMMAND [ARGS]

DESCRIPTION

Andrew Morton originally developed a set of scripts for maintaining kernel patches outside of any SCM tool. Others extended these into a suite called quilt. The basic idea behind quilt is to maintain patches instead of maintaining source files. Patches can be added, removed or reordered, and they can be refreshed as you fix bugs or update to a new base revision. quilt is very powerful, but it is not integrated with the underlying SCM tools. This makes it difficult to visualize your changes.

Guilt allows one to use quilt functionality on top of a Git repository. Changes are maintained as patches which are committed into Git. Commits can be removed or reordered, and the underlying patch can be refreshed based on changes made in the working directory. The patch directory can also be placed under revision control, so you can have a separate history of changes made to your patches.

PATCHES DIRECTORY

In Guilt, all the patches are stored in .git/patches/$branch/, where $branch is the name of the branch being worked on. This means that one can have a independent series of patches for each branch present in the repository. Each of these per-branch directories contains 2 special files:

series: This file contains a list of all the patch filenames relative to the per-branch patch directory. Empty and commented out lines are ignored.

status: This file contains the state of the stack. What patches are applied.

HOOKS

Any guilt operation may execute zero or more hook scripts which can be used to run any houskeeping commands or even abort the execution of the command.

HOOKS DIRECTORY

Guilt follows the same basic design of hooks in Git itself. All Guilt hooks are executable files (generally shell scripts, but they can be anything the operating system can execute) in .git/hooks/guilt/.

The following hooks are supported:

delete <patch name>

Executed when a patch is deleted from the patch series via guilt1.

GUILT COMMANDS

All commands can be called with or without a dash. e.g. guilt add or guilt-add

guilt1

guilt-add - Add a file to git and guilt.

guilt1

guilt-applied - List applied patches.

guilt1

guilt-branch - Branch the entire patch series.

guilt1

guilt-delete - Delete a patch.

guilt1

guilt-diff - Outputs various diffs.

guilt1

guilt-export - Export a patch series (to be used by quilt).

guilt1

guilt-files - Print the list of files that the topmost patch changes.

guilt1

guilt-fold - Fold a specified patch into the topmost applied patch.

guilt1

guilt-fork - Fork the topmost applied patch.

guilt1

guilt-graph - Create a patch dependency graph.

guilt1

guilt-header - Print a patch header.

guilt1

guilt-help - open man page of a guilt command.

guilt1

guilt-import-commit - Import one or more commits as patches.

guilt1

guilt-import - Import specified patch file.

guilt1

guilt-init - Initialize guilt for use in a git repository.

guilt1

guilt-new - Create a new patch.

guilt1

guilt-next - Output the name of next patch to be pushed.

guilt1

guilt-patchbomb - Email a series of commits interactively.

guilt1

guilt-pop - Pop patches from the tree.

guilt1

guilt-prev - Output name of second topmost applied patch.

guilt1

guilt-push - Push patches onto the tree.

guilt1

guilt-rebase - Rebase pushed patches.

guilt1

guilt-refresh - Refresh topmost applied patch.

guilt1

guilt-repair - Repair the repository state.

guilt1

guilt-rm - Remove a file from the git tree and guilt.

guilt1

guilt-series - Print the stack of patches.

guilt1

guilt-status - Print the status of files since the last refresh.

guilt1

guilt-top - Output name of topmost applied patch.

guilt1

guilt-unapplied - List all unapplied patches.

Author

Written by Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>

Documentation

Documentation by Brandon Philips <brandon@ifup.org> and Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>

GUILT

Part of the guilt7 suite (Generated for Guilt )