diff --git a/commands/misc.ipynb b/commands/misc.ipynb index 871d948..6510f68 100644 --- a/commands/misc.ipynb +++ b/commands/misc.ipynb @@ -1,7 +1,7 @@ { "metadata": { "name": "", - "signature": "sha256:809d7013e8827d69ad6bd081281c1bca3afdf2ca3556091669cfa1f9077ece91" + "signature": "sha256:fe560fb7ec0203c6822ae09be96cbbe66d66fbbcad3885529aa6d4969a2e7074" }, "nbformat": 3, "nbformat_minor": 0, @@ -178,9 +178,6 @@ "!git push -u origin master\n", "!git push\n", "\n", - "# Pull down from master\n", - "!git pull origin master\n", - "\n", "# Diff files\n", "!git diff HEAD\n", "!git diff --staged\n", @@ -209,8 +206,19 @@ "!git clone https://donnemartin@bitbucket.org/donnemartin/tutorial.git\n", " \n", "# Update a local repository with changes from a remote repository\n", + "# (pull down from master)\n", "!git pull origin master\n", "\n", + "# Configuring a remote for a fork\n", + "!git remote -v\n", + "!git remote add upstream [target]\n", + "!git remote -v\n", + "\n", + "# Syncing a fork\n", + "!git fetch upstream\n", + "!git checkout master\n", + "!git merge upstream/master\n", + "\n", "# Create a file containing a patch\n", "# git format-patch are like normal patch files, but they also carry information \n", "# about the git commit that created the patch: the author, the date, and the \n",