merging and rebasing link

pyratebeard commited 2019-01-02 16:38:32 +0000 commit e011854ea5830c22f520972472f314df0830382a

				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

...	...	@@ -21,7 +21,10 @@ git config user.username 'name'
21	21
22	22	[branching model][]
23	23
	24	+[merging and rebasing][]
	25	+
24	26	[making a pull request]: https://www.atlassian.com/git/tutorials/making-a-pull-request
25	27	[branching and rebasing]: https://git-scm.com/book/en/v2/Git-Branching-Rebasing
26	28	[branching model]: https://nvie.com/posts/a-successful-git-branching-model/
27	29	[single repo]: https://help.github.com/articles/setting-your-username-in-git/
	30	+[merging and rebasing]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing