Skip to content

Instantly share code, notes, and snippets.

@inigomarquinez
Last active April 15, 2024 10:55
Show Gist options
  • Save inigomarquinez/0d920a304f2ad14fa7c9f8a0c83906de to your computer and use it in GitHub Desktop.
Save inigomarquinez/0d920a304f2ad14fa7c9f8a0c83906de to your computer and use it in GitHub Desktop.
Incorporating changes from another user's fork into your fork
git remote add <remote-alias> <remote-url>
git pull <remote-alias> <remote-branch>
# Example
➜ expressjs-expressjs.com git:(gh-pages) git remote -v
origin git@github.com:inigomarquinez/expressjs-expressjs.com.git (fetch)
origin git@github.com:inigomarquinez/expressjs-expressjs.com.git (push)
➜ expressjs-expressjs.com git:(gh-pages) git remote add ulises git@github.com:ulisesgascon/expressjs.com.git
➜ expressjs-expressjs.com git:(gh-pages) git remote -v
origin git@github.com:inigomarquinez/expressjs-expressjs.com.git (fetch)
origin git@github.com:inigomarquinez/expressjs-expressjs.com.git (push)
ulises git@github.com:ulisesgascon/expressjs.com.git (fetch)
ulises git@github.com:ulisesgascon/expressjs.com.git (push)
➜ expressjs-expressjs.com git:(gh-pages) git checkout -b docs/min-node-version
Switched to a new branch 'docs/min-node-version'
➜ expressjs-expressjs.com git:(docs/min-node-version) git pull ulises chore/dockerize
remote: Enumerating objects: 19, done.
remote: Counting objects: 100% (19/19), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 14 (delta 6), reused 14 (delta 6), pack-reused 0
Unpacking objects: 100% (14/14), 4.86 KiB | 622.00 KiB/s, done.
From github.com:ulisesgascon/expressjs.com
* branch chore/dockerize -> FETCH_HEAD
* [new branch] chore/dockerize -> ulises/chore/dockerize
Updating 8bc34ddc..c85b8109
Fast-forward
.github/workflows/ci.yml | 6 ++++++
Dockerfile | 23 +++++++++++++++++++++++
Makefile | 27 +++++++++++++++++++++++++++
README.md | 7 +++++++
4 files changed, 63 insertions(+)
create mode 100644 Dockerfile
create mode 100644 Makefile
➜ expressjs-expressjs.com git:(docs/min-node-version) git status
On branch docs/min-node-version
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: index.md
no changes added to commit (use "git add" and/or "git commit -a")
➜ expressjs-expressjs.com git:(docs/min-node-version) ✗ git checkout gh-pages
M index.md
Switched to branch 'gh-pages'
Your branch is up to date with 'origin/gh-pages'.
➜ expressjs-expressjs.com git:(gh-pages) ✗ git status
On branch gh-pages
Your branch is up to date with 'origin/gh-pages'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: index.md
no changes added to commit (use "git add" and/or "git commit -a")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment