Fix own comment
This commit is contained in:
parent
81a42a2887
commit
56df3e498c
1 changed files with 2 additions and 2 deletions
|
@ -6,8 +6,8 @@
|
||||||
content="""
|
content="""
|
||||||
If starting commit id _and_ commit id from when history is being dropped are documented, you could potentially drop more data.
|
If starting commit id _and_ commit id from when history is being dropped are documented, you could potentially drop more data.
|
||||||
|
|
||||||
* Don't have any commits in common? Full merge?
|
* Don't have any commits in common? Full merge.
|
||||||
* Only share the starting ids? Reduce local history as much as possible and then merge.
|
* Only share the starting ids? Reduce local history as much as possible, and then merge.
|
||||||
* Share both starting id and have the last id somewhere in history? Take history from last id up to current, reduce that, and merge.
|
* Share both starting id and have the last id somewhere in history? Take history from last id up to current, reduce that, and merge.
|
||||||
|
|
||||||
-- RichiH
|
-- RichiH
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue