diff options
Diffstat (limited to 'doc/bugs/making_annex-merge_try_a_fast-forward.mdwn')
| -rw-r--r-- | doc/bugs/making_annex-merge_try_a_fast-forward.mdwn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/bugs/making_annex-merge_try_a_fast-forward.mdwn b/doc/bugs/making_annex-merge_try_a_fast-forward.mdwn index a2bd8c747..41a5a2a58 100644 --- a/doc/bugs/making_annex-merge_try_a_fast-forward.mdwn +++ b/doc/bugs/making_annex-merge_try_a_fast-forward.mdwn @@ -27,3 +27,9 @@ But as sometimes annex-merge takes time, it would probably be worth it > > Although, perhaps fast-forward merge would use slightly > less space. --[[Joey]] + +>> To avoid the ladder-merge between two repositories described at +>> <http://sprunge.us/LOMU>, seems a fast-forward should be detected and +>> written to git, even if the index is still updated the current way. +>> [[done]] +>> --[[Joey]] |