diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-06-13 21:55:53 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-13 21:55:53 -0400 |
| commit | b65c6da6f4bc5d92371716628431ea314fc56f2a (patch) | |
| tree | e2f5fc275577ce8e1b83a6e27df923b4d45733c9 | |
| parent | 223e1724628178db6ea43b1d87f54dbdcb76cb61 (diff) | |
comment
| -rw-r--r-- | doc/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/comment_4_49bdbdc261c8e5b72f84c52014f892df._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/comment_4_49bdbdc261c8e5b72f84c52014f892df._comment b/doc/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/comment_4_49bdbdc261c8e5b72f84c52014f892df._comment new file mode 100644 index 000000000..991ad48a8 --- /dev/null +++ b/doc/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/comment_4_49bdbdc261c8e5b72f84c52014f892df._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 4""" + date="2016-06-14T01:55:03Z" + content=""" +Forgot to mention that the repeated merge commits happened because git +merge -no-ff was being used, which makes a merge commit even when it can +just fast-forward. That was removed as part of the fix, so the repeated +merges should also be resolved. +"""]] |