grimoire

commit e011854ea5830c22f520972472f314df0830382a
parent 1be2c3ac65eaf61a1bd53fe31e21d8e9598d692f
Author: pyratebeard <root@pyratebeard.net>
Date:   Wed,  2 Jan 2019 16:38:32 +0000

merging and rebasing link

Diffstat:
M
coding/git.md
 | 
3
+++

1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/coding/git.md b/coding/git.md
@@ -21,7 +21,10 @@ git config user.username 'name'
 
 [branching model][]
   
+[merging and rebasing][]
+
 [making a pull request]: https://www.atlassian.com/git/tutorials/making-a-pull-request
 [branching and rebasing]: https://git-scm.com/book/en/v2/Git-Branching-Rebasing
 [branching model]: https://nvie.com/posts/a-successful-git-branching-model/
 [single repo]: https://help.github.com/articles/setting-your-username-in-git/
+[merging and rebasing]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing