summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a <frederik@web>2016-03-04 14:06:17 +0000
committerGravatar admin <admin@branchable.com>2016-03-04 14:06:17 +0000
commitbd1cada718046fd5886034f296f02f6837a16682 (patch)
tree015e29661da207f3934649b2ed47c3008fb2a818 /doc
parentfb573be400fe63dc8446766d7dfa94dd32b06f5a (diff)
Added a comment
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/Undo_git_merge_git-annex/comment_1_0b15f7a8c3bca87dcbf748a229e13a4b._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/forum/Undo_git_merge_git-annex/comment_1_0b15f7a8c3bca87dcbf748a229e13a4b._comment b/doc/forum/Undo_git_merge_git-annex/comment_1_0b15f7a8c3bca87dcbf748a229e13a4b._comment
new file mode 100644
index 000000000..bbc6117f7
--- /dev/null
+++ b/doc/forum/Undo_git_merge_git-annex/comment_1_0b15f7a8c3bca87dcbf748a229e13a4b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a"
+ nickname="frederik"
+ subject="comment 1"
+ date="2016-03-04T14:06:17Z"
+ content="""
+git revert -m 1 [sha_of_merge] seems to have done the trick
+"""]]