NAME¶

guilt - quilt on top of git

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 3 special files: guards: This file contains any guards that should be applied to the series when pushing. It is only present when guards are selected. 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 housekeeping 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>

GUILT COMMANDS¶

All commands can be called with or without a dash. e.g. guilt add or guilt-add guilt-add(1) guilt-applied(1) guilt-branch(1) guilt-commit(1) guilt-delete(1) guilt-diff(1) guilt-export(1) guilt-files(1) guilt-fold(1) guilt-fork(1) guilt-graph(1) guilt-guard(1) guilt-header(1) guilt-help(1) guilt-import-commit(1) guilt-import(1) guilt-init(1) guilt-new(1) guilt-next(1) guilt-patchbomb(1) guilt-pop(1) guilt-prev(1) guilt-push(1) guilt-rebase(1) guilt-refresh(1) guilt-repair(1) guilt-rm(1) guilt-select(1) guilt-series(1) guilt-status(1) guilt-top(1) guilt-unapplied(1)

AUTHOR¶

Written by Josef "Jeff" Sipek < jeffpc@josefsipek.net[1]>

DOCUMENTATION¶

Documentation by Brandon Philips < brandon@ifup.org[2]> and Josef "Jeff" Sipek < jeffpc@josefsipek.net[1]>

GUILT¶

Part of the guilt(7) suite (Generated for Guilt v0.35)

NOTES¶

1.

jeffpc@josefsipek.net

2.

brandon@ifup.org