Git guilt によるパッチ管理 ref: https://qiita.com/watagashi/items/44c03f702b54d28438fb

file0.txt

% git clone http://repo.or.cz/guilt.git
Cloning into 'guilt'...
remote: Counting objects: 3844, done.
remote: Total 3844 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (3844/3844), 624.05 KiB | 152.00 KiB/s, done.
Resolving deltas: 100% (2864/2864), done.

file1.txt

% make install
install -d /usr/local/bin/
install -m 755 guilt /usr/local/bin/
install -d /usr/local/lib/guilt/
install -m 755 guilt-add guilt-applied guilt-branch guilt-commit guilt-delete guilt-diff guilt-export guilt-files guilt-fold guilt-fork guilt-graph guilt-guard guilt-header guilt-help guilt-import guilt-import-commit guilt-init guilt-new guilt-next guilt-patchbomb guilt-pop guilt-prev guilt-push guilt-rebase guilt-refresh guilt-repair guilt-rm guilt-select guilt-series guilt-status guilt-top guilt-unapplied /usr/local/lib/guilt/
install -m 644 os.Darwin os.FreeBSD os.Linux os.SunOS /usr/local/lib/guilt/

file10.txt

% git remote
origin

file11.diff

% guilt diff
diff --git a/index.html b/index.html
index 98accc3..394d1ca 100644
--- a/index.html
+++ b/index.html
@@ -12,6 +12,12 @@
                <!-- Theme used for syntax highlighting of code -->
                <link rel="stylesheet" href="lib/css/zenburn.css">

+               <style type="text/css">
+               .reveal code {
+                       font-family: "Source Code Pro", "Courier New", monospace;
+               }
+               </style>
+
                <!-- Printing and PDF exports -->
                <script>
                        var link = document.createElement( 'link' );

file12.txt

% git status
On branch guilt/master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   index.html

no changes added to commit (use "git add" and/or "git commit -a")

file13.txt

% guilt refresh
Patch code-font refreshed

file14.txt

% guilt new hide-controls

file15.diff

% guilt diff
diff --git a/index.html b/index.html
index 394d1ca..331fee6 100644
--- a/index.html
+++ b/index.html
@@ -43,6 +43,7 @@
                        // - https://github.com/hakimel/reveal.js#configuration
                        // - https://github.com/hakimel/reveal.js#dependencies
                        Reveal.initialize({
+                               controls: false,
                                dependencies: [
                                        { src: 'plugin/markdown/marked.js' },
                                        { src: 'plugin/markdown/markdown.js' },

file16.txt

% guilt refresh
Patch hide-controls refreshed

file17.txt

% git log master..HEAD --oneline
43af056 (HEAD -> guilt/master, refs/patches/master/hide-controls) patch hide-controls
1838f54 (refs/patches/master/code-font) patch code-font

file18.txt

% guilt series 
code-font
hide-controls

file19.txt

% guilt pop
Now at code-font.

file2.txt

% guilt 
Guilt v0.36

Pick a command:
        add      files   import         prev     series
        applied  fold    import-commit  push     status
        branch   fork    init           rebase   top
        commit   graph   new            refresh  unapplied
        delete   guard   next           repair
        diff     header  patchbomb      rm
        export   help    pop            select

Example:
        guilt push

file20.diff

% git diff master
diff --git a/index.html b/index.html
index 98accc3..394d1ca 100644
--- a/index.html
+++ b/index.html
@@ -12,6 +12,12 @@
                <!-- Theme used for syntax highlighting of code -->
                <link rel="stylesheet" href="lib/css/zenburn.css">

+               <style type="text/css">
+               .reveal code {
+                       font-family: "Source Code Pro", "Courier New", monospace;
+               }
+               </style>
+
                <!-- Printing and PDF exports -->
                <script>
                        var link = document.createElement( 'link' );

file21.txt

% guilt applied  # 適用されているパッチ

code-font
% guilt unapplied # 適用されていないパッチ

hide-controls
% guilt series # 全てのパッチ
code-font
hide-controls

file22.diff

% git diff     
diff --git a/index.html b/index.html
index 108a274..c31d574 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@

                <style type="text/css">
                .reveal code {
-                       font-family: "Source Code Pro", "Courier New", monospace;
+                       font-family: "Source Han Code JP", "Source Code Pro", "Courier New", monospace;
                }
                </style>

file23.txt

% guilt refresh
Patch code-font refreshed

file24.diff

% git diff HEAD~
diff --git a/index.html b/index.html
index 98accc3..108a274 100644
--- a/index.html
+++ b/index.html
@@ -12,6 +12,12 @@
                <!-- Theme used for syntax highlighting of code -->
                <link rel="stylesheet" href="lib/css/zenburn.css">

+               <style type="text/css">
+               .reveal code {
+                       font-family: "Source Han Code JP", "Source Code Pro", "Courier New", monospace;
+               }
+               </style>
+
                <!-- Printing and PDF exports -->
                <script>
                        var link = document.createElement( 'link' );

file25.txt

% guilt push    
Applying patch..hide-controls
Patch applied.

file26.txt

% guilt applied
code-font
hide-controls
% guilt unapplied 

file27.txt

% guilt pop -a  
All patches popped.
% guilt push --all
Applying patch..code-font
Patch applied.
Applying patch..hide-controls
Patch applied.

file28.txt

% guilt branch dev   
Switched to branch 'dev'

file29.txt

% guilt series    
code-font
hide-controls

file3.txt

% git clone https://github.com/hakimel/reveal.js.git
Cloning into 'reveal.js'...
remote: Counting objects: 10252, done.
remote: Total 10252 (delta 0), reused 0 (delta 0), pack-reused 10252
Receiving objects: 100% (10252/10252), 7.68 MiB | 450.00 KiB/s, done.
Resolving deltas: 100% (5648/5648), done.
% cd reveal.js 
% ls -F
.git/                   README.md               lib/
.gitignore              bower.json              package.json
.travis.yml             css/                    plugin/
CONTRIBUTING.md         demo.html               test/
Gruntfile.js            index.html
LICENSE                 js/

file30.txt

% git branch -u origin/dev 
Branch 'dev' set up to track remote branch 'dev' from 'origin'.

file31.txt

% git reset --hard origin/dev
HEAD is now at 0c946ae fix missing theme line-height when printing #1967

file32.txt

% guilt push -a
Applying patch..code-font
Patch applied.
Applying patch..hide-controls
Patch applied.

file4.txt

% ls -F .git          
HEAD            description     index           logs/           packed-refs
config          hooks/          info/           objects/        refs/

file5.txt

$ guilt init

file6.txt

% ls -F .git      
HEAD            hooks/          logs/           patches/
config          index           objects/        refs/
description     info/           packed-refs

file7.txt

% ls -F -R .git/patches
master/

.git/patches/master:
series  status

file8.txt

% guilt new code-font

file9.txt

% git status
On branch guilt/master
nothing to commit, working tree clean