% setup_repo % git config guilt.diffstat true %% empty + empty (diffstat=true) % guilt new empty-1 % guilt pop All patches popped. % guilt push Applying patch..empty-1 Patch applied. % guilt new empty-2 % guilt pop Now at empty-1. % guilt push Applying patch..empty-2 Patch applied. % guilt pop Now at empty-1. % guilt fold empty-2 % guilt pop All patches popped. % guilt push Applying patch..empty-1 Patch applied. % list_files d .git/patches d .git/patches/master d .git/refs/patches d .git/refs/patches/master f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 4ea806e306f0228a8ef41f186035e7b04097f1f2 .git/patches/master/status f 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty-1 f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f d28d87b88c1e24d637e390dc3603cfa7c1715711 .git/patches/master/series f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ r bde3d337af70f36836ad606c800d194006f883b3 .git/refs/patches/master/empty-1 % guilt pop All patches popped. % guilt delete -f empty-1 % list_files d .git/patches d .git/patches/master d .git/refs/patches f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status %% empty + nonempty (diffstat=true) % guilt new empty % guilt pop All patches popped. % guilt push Applying patch..empty Patch applied. % guilt new -f -s -m A commit message. nonempty % guilt pop Now at empty. % guilt push Applying patch..nonempty Patch applied. % guilt pop Now at empty. % guilt fold nonempty % guilt pop All patches popped. % guilt push Applying patch..empty Patch applied. % list_files d .git/patches d .git/patches/master d .git/refs/patches d .git/refs/patches/master f 15aab0fd8b937eb3bb01841693f35dcb75da2faf .git/patches/master/status f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~ f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 683678040eef9334d6329e00d5b9babda3e65b57 .git/patches/master/empty f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f a26a22287b500a2a372e42c2bab03599bbe37cdf .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/empty % guilt pop All patches popped. % guilt delete -f empty % list_files d .git/patches d .git/patches/master d .git/refs/patches f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~ f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status %% nonempty + empty (diffstat=true) % guilt new -f -s -m A commit message. nonempty % guilt pop All patches popped. % guilt push Applying patch..nonempty Patch applied. % guilt new empty % guilt pop Now at nonempty. % guilt push Applying patch..empty Patch applied. % guilt pop Now at nonempty. % guilt fold empty % guilt pop All patches popped. % guilt push Applying patch..nonempty Patch applied. % list_files d .git/patches d .git/patches/master d .git/refs/patches d .git/refs/patches/master f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 683678040eef9334d6329e00d5b9babda3e65b57 .git/patches/master/nonempty f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f c47ddc01337e3bb67a9968a8823a5ba12be67f77 .git/patches/master/series f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ f f7f068d44bf796d0f7cd14d27d1f48d6e659816a .git/patches/master/status r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/nonempty % guilt pop All patches popped. % guilt delete -f nonempty % list_files d .git/patches d .git/patches/master d .git/refs/patches f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status %% nonempty + nonempty (diffstat=true) % guilt new -f -s -m A commit message. nonempty-1 % guilt pop All patches popped. % guilt push Applying patch..nonempty-1 Patch applied. % guilt new -f -s -m Another commit message. nonempty-2 % guilt pop Now at nonempty-1. % guilt push Applying patch..nonempty-2 Patch applied. % guilt pop Now at nonempty-1. % guilt fold nonempty-2 % guilt pop All patches popped. % guilt push Applying patch..nonempty-1 Patch applied. % list_files d .git/patches d .git/patches/master d .git/refs/patches d .git/refs/patches/master f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 3b526c794741fb2d6b463f3245ab2f260fa74b7b .git/patches/master/status f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 669c9685ce791098bb3573f80af6d720a3689f80 .git/patches/master/nonempty-1 f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f a88f2625f128cfa307a52c8c2e84ed6c32a78d2b .git/patches/master/series f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ r 895dfbc21bde85fcc666a353a6bd32eaec939082 .git/refs/patches/master/nonempty-1 % guilt pop All patches popped. % guilt delete -f nonempty-1 % list_files d .git/patches d .git/patches/master d .git/refs/patches f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status % git config guilt.diffstat false %% empty + empty (diffstat=false) % guilt new empty-1 % guilt pop All patches popped. % guilt push Applying patch..empty-1 Patch applied. % guilt new empty-2 % guilt pop Now at empty-1. % guilt push Applying patch..empty-2 Patch applied. % guilt pop Now at empty-1. % guilt fold empty-2 % guilt pop All patches popped. % guilt push Applying patch..empty-1 Patch applied. % list_files d .git/patches d .git/patches/master d .git/refs/patches d .git/refs/patches/master f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 4ea806e306f0228a8ef41f186035e7b04097f1f2 .git/patches/master/status f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f d28d87b88c1e24d637e390dc3603cfa7c1715711 .git/patches/master/series f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1 f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ r bde3d337af70f36836ad606c800d194006f883b3 .git/refs/patches/master/empty-1 % guilt pop All patches popped. % guilt delete -f empty-1 % list_files d .git/patches d .git/patches/master d .git/refs/patches f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status %% empty + nonempty (diffstat=false) % guilt new empty % guilt pop All patches popped. % guilt push Applying patch..empty Patch applied. % guilt new -f -s -m A commit message. nonempty % guilt pop Now at empty. % guilt push Applying patch..nonempty Patch applied. % guilt pop Now at empty. % guilt fold nonempty % guilt pop All patches popped. % guilt push Applying patch..empty Patch applied. % list_files d .git/patches d .git/patches/master d .git/refs/patches d .git/refs/patches/master f 15aab0fd8b937eb3bb01841693f35dcb75da2faf .git/patches/master/status f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~ f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f a26a22287b500a2a372e42c2bab03599bbe37cdf .git/patches/master/series f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/empty % guilt pop All patches popped. % guilt delete -f empty % list_files d .git/patches d .git/patches/master d .git/refs/patches f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~ f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status %% nonempty + empty (diffstat=false) % guilt new -f -s -m A commit message. nonempty % guilt pop All patches popped. % guilt push Applying patch..nonempty Patch applied. % guilt new empty % guilt pop Now at nonempty. % guilt push Applying patch..empty Patch applied. % guilt pop Now at nonempty. % guilt fold empty % guilt pop All patches popped. % guilt push Applying patch..nonempty Patch applied. % list_files d .git/patches d .git/patches/master d .git/refs/patches d .git/refs/patches/master f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f c47ddc01337e3bb67a9968a8823a5ba12be67f77 .git/patches/master/series f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ f f7f068d44bf796d0f7cd14d27d1f48d6e659816a .git/patches/master/status r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/nonempty % guilt pop All patches popped. % guilt delete -f nonempty % list_files d .git/patches d .git/patches/master d .git/refs/patches f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status %% nonempty + nonempty (diffstat=false) % guilt new -f -s -m A commit message. nonempty-1 % guilt pop All patches popped. % guilt push Applying patch..nonempty-1 Patch applied. % guilt new -f -s -m Another commit message. nonempty-2 % guilt pop Now at nonempty-1. % guilt push Applying patch..nonempty-2 Patch applied. % guilt pop Now at nonempty-1. % guilt fold nonempty-2 % guilt pop All patches popped. % guilt push Applying patch..nonempty-1 Patch applied. % list_files d .git/patches d .git/patches/master d .git/refs/patches d .git/refs/patches/master f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 3b526c794741fb2d6b463f3245ab2f260fa74b7b .git/patches/master/status f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1 f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f a88f2625f128cfa307a52c8c2e84ed6c32a78d2b .git/patches/master/series f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ r 895dfbc21bde85fcc666a353a6bd32eaec939082 .git/refs/patches/master/nonempty-1 % guilt pop All patches popped. % guilt delete -f nonempty-1 % list_files d .git/patches d .git/patches/master d .git/refs/patches f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ f 75c672c7dbec8e8275d26d720f499899d04912a4 .git/patches/master/nonempty-1~ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bbdc17918ad7ba268ea90ebf0fb71e32e0f09a02 .git/patches/master/nonempty-2~ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty~ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status