markdown Git作弊表

Posted 2021-05-05

# Command

## Observe your Repository

#### List new or modified files not yet committed
```
git status
```

#### Show the changes to files not yet staged
```
git diff
```

#### Show full change history
```
git log
```

## Synchronize

#### Get the latest changes from origin (no merge)
```
git fetch
```

#### Fetch the latest changes from origin and merge
```
git pull
```

#### Fetch the latest changes from origin and rebase
```
git pull rebase
```

#### Push local changes to the origin
```
git push
```

## Working with Branches
#### List all local branches
```
git branch
```

#### List all branches, local and remote
```
git branch -av
```

#### Create a new branch called my-branch
```
git branch my-branch
```

#### Switch to a branch and update working directory
```
git checkout branch-name
```

#### Delete the branch called my-branch
```
git branch -d my-branch
```

#### Merge branch-a into branch-b
```
git checkout branch-b
git merge branch-a
```

#### Tag the current commit
```
git tag my-tag
```

## Make a change
#### Stages the file, ready for commit
```
git add [file]
```

#### Commit all staged files to versioned history
```
git commit -m "commit message"
```

#### Unstages file, keeping the file changes
```
git reset [file]
```

#### Undoes all commits afer [commit], preserving change locally
```
git reset [commit]
```

#### Discards all history and changes back to the specified commit
```
git reset --hard [commit]
```

## Save fragments

#### Lists all stashed changesets
```
git stash list
```

#### Temporarily stores all modified tracked files
```
git stash
```

#### Temporarily stores all modified tracked files with a stash name
```
git stash save "stash-name"
```

#### Details stash number 'n'
```
git stash show stash@{n} -p
```

#### Restores stash number 'n'
```
git stash apply stash@{n}
```

#### Discards stash number 'n'
```
git stash drop stash@{n}
```

#### Restores the most recently stashed files
```
git stash pop
```

# Git flow

## Feature Flow
#### Feature start
```
git checkout develop
git pull --rebase origin develop
git checkout -b feature/nomfeature
```

#### Feature Share
```
git push origin feature/nomfeature
```

#### Feature finish
```
git checkout develop
git merge --no-ff feature/nomefeature
git branch -d feature/nomefeature
git push origin develop
git push origin :feature/nomefeature (if not pushed)
```

## Hotfix start
#### Hotfix start
```
git checkout master
git pull --rebase origin master
git checkout -b hotfix/hotfix-version
```

#### Hotfix finish
```
git checkout master
git merge --no-ff hotfix/ hotfix-version
git tag -a hotfix-version
git checkout develop
git merge --no-ff hotfix/ hotfix-version
git branch -d hotfix/ hotfix-version
git push origin master
git push origin develop
git push origin --tags
git push origin :hotfix/ hotfix-version (if not pushed)
```


## Release Flow
#### Release start
```
git checkout develop
git pull --rebase origin develop
git checkout -b release/ release-version
```

#### Release Share
```
git push origin feature/ release-version
```

#### Release finish
```
git checkout master
git merge --no-ff release/ release-version
git tag -a release-version
git checkout develop
git merge --no-ff release/ release-version
git branch -d release/ release-version
git push origin master
git push origin develop
git push origin --tags
git push origin :release/ release-version (if not pushed)
```