Git Cheat Sheet: Difference between revisions

From chriesibaum wiki
Jump to navigation Jump to search
No edit summary
Line 12: Line 12:
* https://gist.github.com/ankurk91/c4f0e23d76ef868b139f3c28bde057fc
* https://gist.github.com/ankurk91/c4f0e23d76ef868b139f3c28bde057fc


==How do I update a GitHub forked repository?==
* [https://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository Source]
Add the remote, call it "upstream":
<syntaxhighlight lang="bash">
git remote add upstream https://github.com/whoever/whatever.git
</syntaxhighlight>
Fetch all the branches of that remote into remote-tracking branches
<syntaxhighlight lang="bash">
git fetch upstream
</syntaxhighlight>
Make sure that you're on your master branch:
<syntaxhighlight lang="bash">
git checkout master
</syntaxhighlight>
Rewrite your master branch so that any commits of yours that
aren't already in upstream/master are replayed on top of that
other branch:
<syntaxhighlight lang="bash">
git rebase upstream/master
</syntaxhighlight>
If you don't want to rewrite the history of your master branch, (for example because other people may have cloned it) then you should replace the last command with git merge upstream/master. However, for making further pull requests that are as clean as possible, it's probably better to rebase.
If you've rebased your branch onto upstream/master you may need to force the push in order to push it to your own forked repository on GitHub. You'd do that with:
<syntaxhighlight lang="bash">
git push -f origin master
</syntaxhighlight>





Revision as of 17:25, 11 February 2021

Local GIT Repos


Github

Create pull requests

Signing commits using GPG


How do I update a GitHub forked repository?

Add the remote, call it "upstream":

git remote add upstream https://github.com/whoever/whatever.git

Fetch all the branches of that remote into remote-tracking branches

git fetch upstream

Make sure that you're on your master branch:

git checkout master

Rewrite your master branch so that any commits of yours that aren't already in upstream/master are replayed on top of that other branch:

git rebase upstream/master

If you don't want to rewrite the history of your master branch, (for example because other people may have cloned it) then you should replace the last command with git merge upstream/master. However, for making further pull requests that are as clean as possible, it's probably better to rebase.

If you've rebased your branch onto upstream/master you may need to force the push in order to push it to your own forked repository on GitHub. You'd do that with:

git push -f origin master


tweaks

how to change commit message

GitHub's instructions for doing this:

  1. On the command line, navigate to the repository that contains the commit you want to amend.
  2. Type git commit --amend and press Enter.
  3. In your text editor, edit the commit message and save the commit.
  4. Use the git push --force example-branch command to force push over the old commit.