git-merge-into(1)

1GIT-MERGE-INTO(1)                 Git Extras                 GIT-MERGE-INTO(1)
2
3
4

NAME

6       git-merge-into - Merge one branch into another
7

SYNOPSIS

9       git merge-into [src] <dest> [--ff-only]
10

DESCRIPTION

12       Merge  one branch into another, and keep yourself on current branch. If
13       src branch not given, it will merge current one to dest.
14

OPTIONS

16       <src>
17
18       The name of the branch will be merged into. If this not given, use cur‐
19       rent branch as default.
20
21       <dest>
22
23       The name of the branch to merge into.
24
25       --ff-only
26
27       Refuse to merge and exit with a non-zero status unless the current HEAD
28       is already up-to-date or the merge can be resolved as a fast-forward.
29

EXAMPLES

31       Assume the following history exists and the current branch is src:
32
33
34
35                            A---B---C src(current)
36                           /
37                      D---E---F---G dest
38
39
40
41       After running git merge-into dest, it will look like this:
42
43
44
45                           A---B---C src(current)
46                           /         \
47                      D---E---F---G---H dest
48
49
50
51       The H commit will record the merge result, just  like  what  git  merge
52       does. And src is still the current branch.
53
54       The  default  implementation  of  merge-into  use  git checkout and git
55       merge, which may cause temporary change in the  working  tree.  If  you
56       make  sure  your  branch  can  be merged fast-forward, add --ff-only to
57       avoid files change.
58

AUTHOR

60       Written by spacewander <spacewanderlzx@gmail.com>
61

REPORTING BUGS

63       <https://github.com/tj/git-extras/issues>
64