Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/thiyangt/commongitcommands
Common git commands in a day-to-day workflow
https://github.com/thiyangt/commongitcommands
Last synced: 20 days ago
JSON representation
Common git commands in a day-to-day workflow
- Host: GitHub
- URL: https://github.com/thiyangt/commongitcommands
- Owner: thiyangt
- Created: 2018-12-29T01:47:48.000Z (about 6 years ago)
- Default Branch: master
- Last Pushed: 2019-12-17T00:18:13.000Z (about 5 years ago)
- Last Synced: 2024-10-30T04:59:38.971Z (2 months ago)
- Size: 8.79 KB
- Stars: 0
- Watchers: 1
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# commonGITcommands
Common git commands in a day-to-day workflow
### [Undo the last commit](https://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified)
```shell
$ git reset --soft HEAD~
```
### [Upload large files](https://git-lfs.github.com/)
```shell
$ git lfs track
$ git add .gitattributes
$ git add .
$ git commit -m "message"
$ git push origin master
```
### [How to respond to the message "The following untracked working tree files would be overwritten by merge"](https://stackoverflow.com/questions/17404316/the-following-untracked-working-tree-files-would-be-overwritten-by-merge-but-i)
The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to "pull" your system would be forced to overwrite the local files which are not version controlled.
```shell
git add *
git stash
git pull
```
### [To undo git add .](https://data.agaric.com/undo-git-add-remove-files-staged-git-commit)
```shell
To undo git add . use git reset (no dot)
```
for a single file
```shell
git reset filename.txt
```
### [When your commits is not visible](https://stackoverflow.com/questions/1115854/how-to-resolve-error-bad-index-fatal-index-file-corrupt-when-using-git)
git read-tree
git read-tree
## [set your repository to previous commit](https://stackoverflow.com/questions/4372435/how-can-i-rollback-a-github-repository-to-a-specific-commit)
```shell
git reset --hard
git push origin HEAD --force
```
## Add git large files from mac
1. First you need to install Homebrew on Mac. Type the following command on the main terminal
link: http://osxdaily.com/2018/03/07/how-install-homebrew-mac-os/
```shell
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
```
2. Now you need to install git lfs using homebrew
link: https://stackoverflow.com/questions/48734119/git-lfs-is-not-a-git-command-unclear
```shell
$ brew update
$ brew install git-lfs
```
3. Now on the git terminal of your R project type the following
link: https://developer.lsst.io/v/DM-5063/tools/git_lfs.html
```shell
git lfs track
git lfs track "*.rda"
```
After that commit and push the files.
## Errors
When you get the following error
```shell
To https://github.com/fforms/fforms.git
! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'https://github.com/fforms/fforms.git'
```
use the command
```shell
git push origin master -f
```