diff --git a/man/git-merge-into.1 b/man/git-merge-into.1 new file mode 100644 index 0000000..9cda4ee --- /dev/null +++ b/man/git-merge-into.1 @@ -0,0 +1,76 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-MERGE\-INTO" "1" "March 2015" "" "Git Extras" +. +.SH "NAME" +\fBgit\-merge\-into\fR \- Merge one branch into another +. +.SH "SYNOPSIS" +\fBgit merge\-into\fR [src] [\-\-ff] +. +.SH "DESCRIPTION" +Merge one branch into another, and keep yourself on current branch\. If src branch not given, it will merge current one to dest\. +. +.SH "OPTIONS" + +. +.P +The name of the branch will be merged into\. If this not given, use current branch as default\. +. +.P + +. +.P +The name of the branch to merge into\. +. +.P +\-\-ff +. +.P +Try to use \fBgit push\fR instead of \fBgit merge\fR\. Only work on fast\-forward mode\. +. +.SH "EXAMPLES" +Assume the following history exists and the current branch is src: +. +.IP "" 4 +. +.nf + + A\-\-\-B\-\-\-C src(current) + / + D\-\-\-E\-\-\-F\-\-\-G dest +. +.fi +. +.IP "" 0 +. +.P +After running \fBgit merge\-into dest\fR, it will look like this: +. +.IP "" 4 +. +.nf + + A\-\-\-B\-\-\-C src(current) + / \e + D\-\-\-E\-\-\-F\-\-\-G\-\-\-H dest +. +.fi +. +.IP "" 0 +. +.P +The \fBH\fR commit will record the merge result, just like what \fBgit merge\fR does\. And \fBsrc\fR is still the current branch\. +. +.P +The default implementation of \fBmerge\-into\fR use \fBgit checkout\fR and \fBgit merge\fR, which may cause temporary change in the working tree\. If you make sure your branch can be merged fast\-forward, add \fB\-\-ff\fR to avoid files change\. +. +.SH "AUTHOR" +Written by spacewander <\fIspacewanderlzx@gmail\.com\fR> +. +.SH "REPORTING BUGS" +<\fIhttps://github\.com/tj/git\-extras/issues\fR> +. +.SH "SEE ALSO" +<\fIhttps://github\.com/tj/git\-extras\fR> diff --git a/man/git-merge-into.html b/man/git-merge-into.html new file mode 100644 index 0000000..fa3d36a --- /dev/null +++ b/man/git-merge-into.html @@ -0,0 +1,143 @@ + + + + + + git-merge-into(1) - Merge one branch into another + + + + +
+ + + +
    +
  1. git-merge-into(1)
    2. +
  2. Git Extras
    3. +
  3. git-merge-into(1)
    4. +
+ +

NAME

+

+ git-merge-into - Merge one branch into another +

+ +

SYNOPSIS

+ +

git merge-into [src] <dest> [--ff]

+ +

DESCRIPTION

+ +

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

+ +

OPTIONS

+ +

<src>

+ +

The name of the branch will be merged into. If this not given, use current branch as default.

+ +

<dest>

+ +

The name of the branch to merge into.

+ +

--ff

+ +

Try to use git push instead of git merge. Only work on fast-forward mode.

+ +

EXAMPLES

+ +

Assume the following history exists and the current branch is src:

+ +
                 A---B---C src(current)
+                /
+           D---E---F---G dest
+
+ +

After running git merge-into dest, it will look like this:

+ +
                A---B---C src(current)
+                /         \
+           D---E---F---G---H dest
+
+ +

The H commit will record the merge result, just like what git merge does. +And src is still the current branch.

+ +

The default implementation of merge-into use git checkout and git merge, +which may cause temporary change in the working tree. If you make sure your +branch can be merged fast-forward, add --ff to avoid files change.

+ +

AUTHOR

+ +

Written by spacewander <spacewanderlzx@gmail.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. March 2015
    3. +
  3. git-merge-into(1)
    4. +
+ +
+ + diff --git a/man/git-merge-into.md b/man/git-merge-into.md new file mode 100644 index 0000000..8d200ca --- /dev/null +++ b/man/git-merge-into.md @@ -0,0 +1,57 @@ +git-merge-into(1) -- Merge one branch into another +================================= + +## SYNOPSIS + +`git merge-into` [src] <dest> [--ff] + +## DESCRIPTION + +Merge one branch into another, and keep yourself on current branch. If src branch not given, it will merge current one to dest. + +## OPTIONS + + <src> + + The name of the branch will be merged into. If this not given, use current branch as default. + + <dest> + + The name of the branch to merge into. + + --ff + + Try to use `git push` instead of `git merge`. Only work on fast-forward mode. + +## EXAMPLES + +Assume the following history exists and the current branch is src: + + A---B---C src(current) + / + D---E---F---G dest + +After running `git merge-into dest`, it will look like this: + + A---B---C src(current) + / \ + D---E---F---G---H dest + +The `H` commit will record the merge result, just like what `git merge` does. +And `src` is still the current branch. + +The default implementation of `merge-into` use `git checkout` and `git merge`, +which may cause temporary change in the working tree. If you make sure your +branch can be merged fast-forward, add `--ff` to avoid files change. + +## AUTHOR + +Written by spacewander <> + +## REPORTING BUGS + +<> + +## SEE ALSO + +<>