summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a <frederik@web>2016-03-03 13:01:05 +0000
committerGravatar admin <admin@branchable.com>2016-03-03 13:01:05 +0000
commitffa3023e168bdca714c09bf288db9146a19bf968 (patch)
tree09f45ec65ff28e8940b05776d52b5b131540c027 /doc
parenta3f4384b337c89d59886ff8cffd45501a12e93be (diff)
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/Undo_git_merge_git-annex.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/forum/Undo_git_merge_git-annex.mdwn b/doc/forum/Undo_git_merge_git-annex.mdwn
new file mode 100644
index 000000000..bc299174c
--- /dev/null
+++ b/doc/forum/Undo_git_merge_git-annex.mdwn
@@ -0,0 +1,3 @@
+After accidentally typing git merge git-annex, I am now wondering how to clean up the resulting chaos...
+
+Any tips?