diff --git a/new_git_course/git_talk.md b/new_git_course/git_talk.md index 4e5d73d81ee616559579f01af9a8dab8265bdfdc..b36af9ef4a6d202d1660421fd8361a110abbe544 100644 --- a/new_git_course/git_talk.md +++ b/new_git_course/git_talk.md @@ -203,12 +203,16 @@ omitting the `--global` allows configuration on a per-repo basis ## Merge and Rebase ### Merge \begin{tikzpicture} +\draw + (-1, 0)node[] {main} + (-1, 1)node[] {auxiliary} + ; \draw[line width=.5pt] (0,0)node[draw, circle] (0) {} (1,0)node[draw, circle] (1) {} (2,0)node[draw, circle] (2) {} (3,1)node[draw, circle] (3) {} - (3,0)node[draw, circle] (4) {} + (3,0)node[draw, circle, red] (4) {} (4,1)node[draw, circle] (5) {} [-] (0) -- (1) -- (2) -- (4) [-] (2) -- (3) -- (5) @@ -221,7 +225,7 @@ omitting the `--global` allows configuration on a per-repo basis (10,1)node[draw, circle] (3) {} (10,0)node[draw, circle] (4) {} (11,1)node[draw, circle] (5) {} - (12,0)node[draw, circle] (7) {} + (12,0)node[draw, circle, red] (7) {} [-] (0) -- (1) -- (2) -- (4) -- (7) [-] (2) -- (3) -- (5) -- (7) ; @@ -230,13 +234,17 @@ omitting the `--global` allows configuration on a per-repo basis ### Rebase \begin{tikzpicture} +\draw + (-1, 0)node[] {main} + (-1, 1)node[] {auxiliary} + ; \draw[line width=.5pt] (0,0)node[draw, circle] (0) {} (1,0)node[draw, circle] (1) {} (2,0)node[draw, circle] (2) {} (3,1)node[draw, circle] (3) {} - (3,0)node[draw, circle, red] (4) {} - (4,1)node[draw, circle] (5) {} + (3,0)node[draw, circle] (4) {} + (4,1)node[draw, circle, red] (5) {} [-] (0) -- (1) -- (2) -- (4) [-] (2) -- (3) -- (5) ; @@ -245,11 +253,10 @@ omitting the `--global` allows configuration on a per-repo basis (7,0)node[draw, circle] (0) {} (8,0)node[draw, circle] (1) {} (9,0)node[draw, circle] (2) {} - (10,0)node[draw, circle, red] (4) {} + (10,0)node[draw, circle] (4) {} (11,1)node[draw, circle] (5) {} - (12,1)node[draw, circle] (6) {} - [-] (0) -- (1) -- (2) -- (4) - [-] (4) -- (5) -- (6) + (12,1)node[draw, circle, red] (6) {} + [-] (0) -- (1) -- (2) -- (4) -- (5) -- (6) ; \end{tikzpicture} diff --git a/new_git_course/git_talk.pdf b/new_git_course/git_talk.pdf index cbb95e01a5229da9f2b81b824d7205c1156d0ad5..d068d5f252626d79f434316f49e81c79336d300d 100644 Binary files a/new_git_course/git_talk.pdf and b/new_git_course/git_talk.pdf differ