https://github.com/peoray/git-notes
Simple snippets with brief explanation of git commands I find super-useful and use almost daily
https://github.com/peoray/git-notes
command-line git git-commands
Last synced: about 2 months ago
JSON representation
Simple snippets with brief explanation of git commands I find super-useful and use almost daily
- Host: GitHub
- URL: https://github.com/peoray/git-notes
- Owner: peoray
- Created: 2018-10-28T08:18:51.000Z (over 6 years ago)
- Default Branch: master
- Last Pushed: 2020-04-16T22:59:37.000Z (about 5 years ago)
- Last Synced: 2025-01-17T18:55:14.378Z (3 months ago)
- Topics: command-line, git, git-commands
- Homepage:
- Size: 10.7 KB
- Stars: 1
- Watchers: 1
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# git-notes
Simple snippets with brief explanation of git commands I find super useful and use often.
## Table of Content
1. [How to delete a local branch](#to-delete-a-local-branch)
1. [How to delete a remote branch](#to-delete-a-remote-branch)
1. [How to remove remote origin from Git repository](#to-remove-remote-origin-from-git-repo)
1. [How to update a Github forked repository](#to-update-a-github-forked-repository)
1. [How to untrack a file by Git](#how-to-untrack-a-file-by-git)
1. [How to untrack a directory by Git](#how-to-untrack-a-directory-by-git)
1. [How to delete a .git folder from your project](#to-delete-a-git-folder-from-your-project)
1. [How to change a remote's URL](#to-change-a-remote-url)
1. [How to force push a git repo](#to-force-push-a-git-repo)
1. [How to remove files from git that has been already been deleted from disk](#remove-files-from-git-that-have-already-been-deleted-from-disk)
1. [How to rename a local branch](#to-rename-a-local-git-branch)
1. [How do I delete a Git branch locally and remotely?](#to-delete-a-git-branch-locally-and-remotely)
---
#### To delete a local branch:
**N.B:You cannot delete the branch you are currently on.**
If you are in the same branch that you want to delete, run:
`git checkout ` to switch to another branch(because you can't delete a branch you are currently on)
Then delete the branch you want:
`git branch -d `
**NB:** If you haven't merged the branch you want to delete, you will get this error:
```
error: The branch 'slide' is not fully merged.
If you are sure you want to delete it, run 'git branch -D slide'.
```
To then force delete the branch that hasn't been merged yet:
`git branch -D `
---
#### To delete a remote branch:
`git push --delete `
---
#### To remove remote origin from Git repo:
Instead of removing and re-adding, you can do this:
`git remote set-url git://`
If you insist on deleting it:
`git remote rm `
To add another remote:
`git remote add `
---
#### To update a GitHub forked repository:
Add the remote, call it "upstream":
`git remote add https://github.com//`
Fetch all the branches of that remote into remote-tracking branches, such as upstream/master:
`git fetch `
Make sure that you're on your master branch(or the main branch):
`git checkout master`
Updating your fork from original repo to keep up with their changes:
`git merge upstream/master`
See [here](https://github.com/KirstieJane/STEMMRoleModels/wiki/Syncing-your-fork-to-the-original-repository-via-the-browser) on how to update your forked repo via the browser.
---
#### How to untrack a file by git:
`git rm --cached `
---
#### How to untrack a directory by git:
To remove a file or folde already tracked by git, then you must first remove it (physically, file or folder must be placed out of git folder for the time), commit changes and add the file again to folder. Then git will begin ignoring it using your instruction.
**Step 1:** Add the folder path to your repo's root `.gitignore` file.
**Step 2:** Remove the folder from your local git tracking, but keep it on your disk.
`git rm -r --cached `
**Step 3:** Add, commit and push your changes to your git repo.
The folder will be considered "deleted" from Git's point of view (i.e. they are in past history, but not in the latest commit, and people pulling from this repo will get the files removed from their trees), but stay on your working directory because you've used --`cached`
---
#### To delete a git folder from your project:
`rm -rf .git`
This command will remove `.git` file from the directory.
To confirm:
`git status`
This will give a command of `fatal: Not a git repository (or any of the parent directories): .git`
---
#### To change a remote URL:
List your existing remote:
`git remote -v`
Then to change the existing to a new one:
`git remote set-url origin [URL]`
To confirm:
`git remote -v`
---
#### To force push a git repo:
`git push --force `
**Short flag**
Also note that `-f` is short for `--force`, so
`git push -f `
---
#### Remove files from git that have already been deleted from disk
This tells git to automatically stage tracked files -- including deleting the previously tracked files.
To stage your whole working tree:
`git add -u :/`
To stage just the current path:
`git add -u .`
---
#### To Rename a local git branch
If you're currently in the branch:
`git branch -m `
If you're in another branch:
`git branch -m `
---
#### To delete a Git branch locally and remotely
**Delete Remote Branch**
```
git push -d
git branch -d
```
Note that in most cases the remote name is origin. In such a case you'll have to use the command like so.
`git push -d origin `
**Delete Local Branch**
To delete the local branch use one of the following:
```
git branch -d branch_name
git branch -D branch_nam
```
**Note:** The `-d` option is an alias for --delete, which only deletes the branch if it has already been fully merged in its upstream branch. You could also use `-D`, which is an alias for `--delete --force`, which deletes the branch "irrespective of its merged status."
Don't forget to do a `git fetch --all --prune` on other machines after deleting the remote branch on the server. After deleting the local branch with git branch -d and deleting the remote branch with git push origin --delete other machines may still have "obsolete tracking branches" (to see them do git branch -a). To get rid of these do:
`git fetch --all --prune`