https://github.com/dragonbe/git-training
Tutorial on using git
https://github.com/dragonbe/git-training
Last synced: over 1 year ago
JSON representation
Tutorial on using git
- Host: GitHub
- URL: https://github.com/dragonbe/git-training
- Owner: DragonBe
- Created: 2017-03-15T08:46:53.000Z (over 9 years ago)
- Default Branch: master
- Last Pushed: 2017-03-15T09:56:36.000Z (over 9 years ago)
- Last Synced: 2025-01-21T18:50:29.794Z (over 1 year ago)
- Language: PHP
- Size: 6.84 KB
- Stars: 0
- Watchers: 2
- Forks: 0
- Open Issues: 1
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Git training - The basics
## Creating a new branch
Go to the repository
Fork the original repository
Go to the fork in your own gitHub profile
Copy the link of the fork
```
git clone
git checkout -b
git add
git commit -m "Add comments of the changes"
```
In case of a merge conflict:
(Make sure the upstream is correct)
```
git remote add upstream
git checkout master
git pull upstream master
git checkout
git merge master
```
Compare the files and check for differences. Delete the HEAD and markers where necessary.
```
git add
git push origin
```
## How to change your bash profile:
First dive into your directory and add following lines to `vi ~/.bash_profile`:
```
parse_git_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
}
export PS1="\u@\h \[\033[32m\]\w\[\033[33m\]\$(parse_git_branch)\[\033[00m\] $ "
```
Next change your source with the following command `source ~/.bash_profile`
Now you'll notice some beautiful colors are added in your terminal!