summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w <Rafal@web>2011-07-07 11:08:35 +0000
committerGravatar admin <admin@branchable.com>2011-07-07 11:08:35 +0000
commit8da1dd033684b854b595d39f0b2e86fbfef4d265 (patch)
tree5cdd1d3b81eec8cd490e73e5b744e07d399399fe
parentc5296dee1fa0dd5252b496b7974808538edd4564 (diff)
-rw-r--r--doc/bugs/making_annex-merge_try_a_fast-forward.mdwn3
1 files changed, 3 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
new file mode 100644
index 000000000..532e771bd
--- /dev/null
+++ b/doc/bugs/making_annex-merge_try_a_fast-forward.mdwn
@@ -0,0 +1,3 @@
+While merging the git-annex branch, annex-merge does not end up in a fast-forward even when it would be possible.
+But as sometimes annex-merge takes time, it would probably be worth it
+(but maybe I miss something with my workflow...).