mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
b2576adae0
`git squash` refactor: - first argument can be a branch or a commit reference - the `--me` argument is not required anymore - use `git reset --soft` is squashing on a current branch - if squashing on master branch, prompt for confirmation - does not delete provided branch after squashing - fix bug: if `git merge --squash` command fails, exit script Update README and man pages. Fixes #95 Closes #198
54 lines
1.2 KiB
Groff
54 lines
1.2 KiB
Groff
.\" generated with Ronn/v0.7.3
|
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
|
.
|
|
.TH "GIT\-SQUASH" "1" "July 2014" "" ""
|
|
.
|
|
.SH "NAME"
|
|
\fBgit\-squash\fR \- Import changes form a branch
|
|
.
|
|
.SH "SYNOPSIS"
|
|
\fBgit\-squash\fR <source\-branch|commit ref> [<commit\-message>]
|
|
.
|
|
.SH "DESCRIPTION"
|
|
Produce the working tree and index state as if a real merge happened without the commit or merge marks\.
|
|
.
|
|
.SH "OPTIONS"
|
|
<source\-branch>
|
|
.
|
|
.P
|
|
Branch to squash on the actual branch\.
|
|
.
|
|
.P
|
|
<commit reference> A commit reference (has to be from the current branch) can also be used as the first argument\. A range of commits \fIsha\fR\.\.HEAD will be squashed\.
|
|
.
|
|
.P
|
|
<commit\-message>
|
|
.
|
|
.P
|
|
If commit\-message is given, commit the squash result and delete the source\-branch\.
|
|
.
|
|
.SH "EXAMPLES"
|
|
.
|
|
.nf
|
|
|
|
$ git squash my\-other\-branch
|
|
Updating a2740f5\.\.533b19c
|
|
Fast\-forward
|
|
Squash commit \-\- not updating HEAD
|
|
my\-changed\-file | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
$ git commit \-m "New commit without a real merge"
|
|
|
|
$ git squash HEAD~3 "Commit message"
|
|
.
|
|
.fi
|
|
.
|
|
.SH "AUTHOR"
|
|
Written by Jesús Espino <\fIjespinog@gmail\.com\fR>
|
|
.
|
|
.SH "REPORTING BUGS"
|
|
<\fIhttps://github\.com/visionmedia/git\-extras/issues\fR>
|
|
.
|
|
.SH "SEE ALSO"
|
|
<\fIhttps://github\.com/visionmedia/git\-extras\fR>
|