Code: Select all
--> git remote -v
origin https://github.com/DebianJoe/colors (fetch)
origin https://github.com/DebianJoe/colors (push)
First, I need a remote pointing at Dkeg's repo, so that I can fetch all upstream changes.
Code: Select all
`--> git remote add upstream https://github.com/dkeg/colors
Code: Select all
`--> git remote -v
origin https://github.com/DebianJoe/colors (fetch)
origin https://github.com/DebianJoe/colors (push)
upstream https://github.com/dkeg/colors (fetch)
upstream https://github.com/dkeg/colors (push)
Code: Select all
`--> git fetch upstream
remote: Counting objects: 15, done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 13 (delta 3), reused 12 (delta 2)
Unpacking objects: 100% (13/13), done.
From https://github.com/dkeg/colors
* [new branch] master -> upstream/master
`--> git checkout master
Already on 'master'
`--> git merge upstream/master
Updating 024b846..7d7987e
Fast-forward
canvasedpastel | 26 ++++++++++++++++++++++++++
canvasedpastel.png | Bin 0 -> 50728 bytes
fencetrain | 26 ++++++++++++++++++++++++++
fencetrain.png | Bin 0 -> 50244 bytes
unsiftedwheat | 27 +++++++++++++++++++++++++++
unsiftedwheat.png | Bin 0 -> 48976 bytes
6 files changed, 79 insertions(+)