Git Cheat Sheet: Difference between revisions
No edit summary |
|||
| Line 1: | Line 1: | ||
=Init new Local GIT Repo= | =Init new Local GIT Repo= | ||
'''Setup a repo folder''' | |||
cd to the git repo location | |||
cd to the git repo location, log in as git and create a folder for the new git project repository | |||
<syntaxhighlight lang="bash"> | <syntaxhighlight lang="bash"> | ||
cd /srv/git | cd /srv/git | ||
| Line 8: | Line 9: | ||
</syntaxhighlight> | </syntaxhighlight> | ||
'''Init the repo''' | |||
cd into the <project>.git folder | cd into the <project>.git folder | ||
<syntaxhighlight lang="bash"> | <syntaxhighlight lang="bash"> | ||
| Line 14: | Line 16: | ||
git init --bare | git init --bare | ||
mkdir <project>.git | mkdir <project>.git | ||
</syntaxhighlight> | </syntaxhighlight> | ||
=Local GIT Repos= | =Local GIT Repos= | ||
Revision as of 09:25, 29 April 2021
Init new Local GIT Repo
Setup a repo folder
cd to the git repo location, log in as git and create a folder for the new git project repository
cd /srv/git
su git
mkdir <project>.git
Init the repo
cd into the <project>.git folder
cd <project>.git
git init --bare
mkdir <project>.git
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:
- On the command line, navigate to the repository that contains the commit you want to amend.
- Type
git commit --amendand press Enter. - In your text editor, edit the commit message and save the commit.
- Use the
git push --force example-branchcommand to force push over the old commit.