Differences

This shows you the differences between two versions of the page.

--- git_atlassian_content [2018/02/11 11:49] – [filter-branch] rpjday
+++ git_atlassian_content [2018/02/11 12:14] (current) – [submodule/subtree] rpjday
@@ Line 87: / Line 87: @@
 ==== Misc ====
-  * [[https://www.atlassian.com/blog/git/git-hooks-for-continuous-integration?_ga=2.219544601.1090809261.1518347245-47538564.1516199112|Git hooks for continuous integration]] (Goff-Dupont, Feb 2016)
+  * [[https://www.atlassian.com/blog/git/git-hooks-for-continuous-integration?|Git hooks for continuous integration]] (Goff-Dupont, Feb 2016)
-  * [[https://www.atlassian.com/blog/git/advanced-git-aliases?_ga=2.163984447.1090809261.1518347245-47538564.1516199112|One weird trick for powerful Git aliases]] (Paolucci, Oct 2014)
+  * [[https://www.atlassian.com/blog/git/advanced-git-aliases?|One weird trick for powerful Git aliases]] (Paolucci, Oct 2014)
+  * [[https://www.atlassian.com/blog/git/git-automatic-merges-with-server-side-hooks-for-the-win?|Git: automatic merges with server side hooks (for the win!)]] (Paolucci, May 2013)
 ==== Repository management ====
@@ Line 114: / Line 115: @@
 ==== submodule/subtree ====
+  * [[https://www.atlassian.com/blog/git/alternatives-to-git-submodule-git-subtree|Git subtree: the alternative to Git submodule]] (Paolucci, May 2013)
+  * [[https://developer.atlassian.com/blog/2015/05/the-power-of-git-subtree/|The power of Git subtree]] (Paolucci, May 2015)
   * [[https://www.atlassian.com/blog/git/alternatives-to-git-submodule-git-subtree|Git subtree: the alternative to Git submodule]] (Paolucci, updated Jan 2017).
   * [[https://www.atlassian.com/blog/git/git-submodules-workflows-tips?|Git submodules: core concept, workflows, and tips]] (Paolucci, Mar 2013)