mirror of
https://github.com/newren/git-filter-repo.git
synced 2024-11-19 03:25:33 +00:00
2c8f763426
We have a good default for pruning of empty commits and degenerate merge commits: only pruning such commits that didn't start out that way (i.e. that couldn't intentionally have been empty or degenerate). However, users may have reasons to want to aggressively prune such commits (maybe they used BFG repo filter or filter-branch previously and have lots of cruft commits that they want remoed), and we may as well allow them to specify that they don't want pruning too, just to be flexible. Signed-off-by: Elijah Newren <newren@gmail.com>
98 lines
1.9 KiB
Plaintext
98 lines
1.9 KiB
Plaintext
feature done
|
|
reset refs/heads/master
|
|
commit refs/heads/master
|
|
mark :1
|
|
author Full Name <user@organization.tld> 1000020000 +0100
|
|
committer Full Name <user@organization.tld> 1000020000 +0100
|
|
data 2
|
|
C
|
|
|
|
commit refs/heads/master
|
|
mark :2
|
|
author Full Name <user@organization.tld> 1000030000 +0100
|
|
committer Full Name <user@organization.tld> 1000030000 +0100
|
|
data 2
|
|
D
|
|
from :1
|
|
|
|
reset refs/heads/master
|
|
commit refs/heads/master
|
|
mark :3
|
|
author Full Name <user@organization.tld> 1000000000 +0100
|
|
committer Full Name <user@organization.tld> 1000000000 +0100
|
|
data 2
|
|
A
|
|
|
|
commit refs/heads/master
|
|
mark :4
|
|
author Full Name <user@organization.tld> 1000010000 +0100
|
|
committer Full Name <user@organization.tld> 1000010000 +0100
|
|
data 2
|
|
B
|
|
from :3
|
|
|
|
blob
|
|
mark :5
|
|
data 10
|
|
keepme v1
|
|
|
|
commit refs/heads/master
|
|
mark :6
|
|
author Full Name <user@organization.tld> 1000040000 +0100
|
|
committer Full Name <user@organization.tld> 1000040000 +0100
|
|
data 29
|
|
E: Merge commit 'D' into 'B'
|
|
from :4
|
|
merge :2
|
|
M 100644 :5 keepme
|
|
|
|
commit refs/heads/master
|
|
mark :7
|
|
author Full Name <user@organization.tld> 1000060000 +0100
|
|
committer Full Name <user@organization.tld> 1000060000 +0100
|
|
data 2
|
|
G
|
|
from :6
|
|
|
|
commit refs/heads/master
|
|
mark :8
|
|
author Full Name <user@organization.tld> 1000070000 +0100
|
|
committer Full Name <user@organization.tld> 1000070000 +0100
|
|
data 2
|
|
H
|
|
from :7
|
|
|
|
commit refs/heads/master
|
|
mark :9
|
|
author Full Name <user@organization.tld> 1000050000 +0100
|
|
committer Full Name <user@organization.tld> 1000050000 +0100
|
|
data 29
|
|
F: Merge commit 'D' into 'B'
|
|
from :4
|
|
merge :2
|
|
|
|
blob
|
|
mark :10
|
|
data 10
|
|
keepme v2
|
|
|
|
commit refs/heads/master
|
|
mark :11
|
|
author Full Name <user@organization.tld> 1000080000 +0100
|
|
committer Full Name <user@organization.tld> 1000080000 +0100
|
|
data 2
|
|
I
|
|
from :9
|
|
M 100644 :10 keepme
|
|
|
|
commit refs/heads/master
|
|
mark :12
|
|
author Full Name <user@organization.tld> 1000090000 +0100
|
|
committer Full Name <user@organization.tld> 1000090000 +0100
|
|
data 29
|
|
J: Merge commit 'I' into 'H'
|
|
from :8
|
|
merge :11
|
|
|
|
done
|