summaryrefslogtreecommitdiff
path: root/doc/markdown/markdown.md
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-05-20 16:23:04 -0500
committerDouwe Maan <douwe@selenight.nl>2016-05-20 16:23:04 -0500
commitfc1910ddc5db25e608921f69c3dc28d830e6ea03 (patch)
tree1f82bd43de18fdb6ec1d01801d7d75c08bdf7928 /doc/markdown/markdown.md
parent63f53730c0483b4c9e6fa9d90413d40a8c74a243 (diff)
parent5341b16fc92425d557a1c62d0329b276170eba73 (diff)
downloadgitlab-ce-fc1910ddc5db25e608921f69c3dc28d830e6ea03.tar.gz
Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
# Conflicts: # app/services/system_note_service.rb
Diffstat (limited to 'doc/markdown/markdown.md')
-rw-r--r--doc/markdown/markdown.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index b10fef7179e..236eb7b12c4 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -8,6 +8,7 @@
* [Multiple underscores in words](#multiple-underscores-in-words)
* [URL auto-linking](#url-auto-linking)
* [Code and Syntax Highlighting](#code-and-syntax-highlighting)
+* [Inline Diff](#inline-diff)
* [Emoji](#emoji)
* [Special GitLab references](#special-gitlab-references)
* [Task lists](#task-lists)
@@ -153,6 +154,19 @@ s = "There is no highlighting for this."
But let's throw in a <b>tag</b>.
```
+## Inline Diff
+
+With inline diffs tags you can display {+ additions +} or [- deletions -].
+
+The wrapping tags can be either curly braces or square brackets [+ additions +] or {- deletions -}.
+
+However the wrapping tags cannot be mixed as such:
+
+- {+ additions +]
+- [+ additions +}
+- {- deletions -]
+- [- deletions -}
+
## Emoji
Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you: