Sets merge commit as default when pulling

dpshelio · dpshelio · commit c9f5f0529e16 · 2022-10-09T18:09:09.000+01:00
diff --git a/ch02git/05Collaboration.ipynb b/ch02git/05Collaboration.ipynb
@@ -512,7 +512,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Do as it suggests:"
+    "Do as it suggests. However, we need first to tell git how we want it to act when there are diverging branches (as in this case). We will set the default to be to create a merge commit, then we proceed to `pull`."
    ]
   },
   {
@@ -547,6 +547,7 @@
    ],
    "source": [
     "%%bash\n",
+    "git config --global pull.rebase false\n",
     "git pull"
    ]
   },

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@`
`512`	`512`	`"cell_type": "markdown",`
`513`	`513`	`"metadata": {},`
`514`	`514`	`"source": [`
`515`		`- "Do as it suggests:"`
	`515`	+ "Do as it suggests. However, we need first to tell git how we want it to act when there are diverging branches (as in this case). We will set the default to be to create a merge commit, then we proceed to `pull`."
`516`	`516`	`]`
`517`	`517`	`},`
`518`	`518`	`{`
`@@ -547,6 +547,7 @@`
`547`	`547`	`],`
`548`	`548`	`"source": [`
`549`	`549`	`"%%bash\n",`
	`550`	`+ "git config --global pull.rebase false\n",`
`550`	`551`	`"git pull"`
`551`	`552`	`]`
`552`	`553`	`},`