Command | Description |
---|---|
git status |
Check status |
git add [file-name.txt] |
Add a file to the staging area |
git add -A |
Add all new and changed files to the staging area |
git commit -m "[commit message]" |
Commit changes |
git rm -r [file-name.txt] |
Remove a file (or folder) |
git reset --hard |
Reset the staging area and the working directory to match the most recent commit. |
Command | Description |
---|---|
git branch |
List branches (the asterisk denotes the current branch) |
git branch -a |
List all branches (local and remote) |
git branch [branch name] |
Create a new branch |
git branch -d [branch name] |
Delete a branch |
git push origin --delete [branch name] |
Delete a remote branch |
git checkout -b [branch name] |
Create a new branch and switch to it |
git checkout -b [branch name] origin/[branch name] |
Clone a remote branch and switch to it |
git checkout [branch name] |
Switch to a branch |
git merge [branch name] |
Merge a branch into the active branch |
git merge [source branch] [target branch] |
Merge a branch into a target branch |
Command | Description |
---|---|
git flow feature start MYFEATURE |
Create a feature branch |
git flow feature finish MYFEATURE |
Finish a feature and merges the feature into develop |
git flow feature publish MYFEATURE |
Publish a feature to the remote server |
git flow feature pull origin MYFEATURE |
Get a feature published by another user |
git flow release start RELEASE [BASE] |
Start a release, optionally supply a BASE commit sha-1 hash to start the release from |
git flow release publish RELEASE |
Publish the release branch |
git flow release finish RELEASE |
Finishing a release, tags the release with its name. Don't forget to push your tags git push origin --tags |
Command | Description |
---|---|
git push origin [branch name] |
Push a branch to your remote repository |
git push -u origin [branch name] |
Push changes to remote repository (and remember the branch) |
git push |
Push changes to remote repository (remembered branch) |