add wiki for git-merge-into

This commit is contained in:
spacewander 2015-03-11 14:47:08 +08:00
parent 2a9ce31d25
commit b2c937e03a

View file

@ -13,6 +13,7 @@
- [`git delete-tag`](#git-delete-tag)
- [`git delete-merged-branches`](#git-delete-merged-branches)
- [`git fresh-branch`](#git-fresh-branch)
- [`git merge-into`](#git-merge-into)
- [`git graft`](#git-graft)
- [`git alias`](#git-alias)
- [`git ignore`](#git-ignore)
@ -475,6 +476,14 @@ Create empty local branch `name`:
$ git fresh-branch docs
```
## git merge-into
Merge `src` branch into `dest`, and keep yourself on current branch. If `src` branch not given, it will merge current one to `dest`:
```bash
$ git merge-into [src] dest
```
## git graft
Merge commits from `src-branch` into `dest-branch`. (`dest-branch` defaults to `master`.)