Skip site navigation (1)Skip section navigation (2)

FreeBSD Manual Pages

  
 
  

home | help
GIT-SQUASH(1)			  Git Extras			 GIT-SQUASH(1)

NAME
       git-squash - Import changes from	a branch

SYNOPSIS
       git-squash   [<--squash-messages>]  <source-branch|commit  ref>	[<com-
       mit-message>]

DESCRIPTION
       Produce the working tree	and index state	as if a	 real  merge  happened
       without the commit or merge marks.

OPTIONS
       <source-branch>

       Branch to squash	on the current branch.

       <commit	reference>  A  commit  reference  (has	to be from the current
       branch) can also	be used	as the first  argument.	 A  range  of  commits
       sha..HEAD will be squashed.

       <--squash-msg>

       Commit  the squash result with the concatenated squashed	committed mes-
       sages. This option can not be used together with	<commit-message>.

       <commit-message>

       If commit-message is given, commit the squash result.

EXAMPLES
       $ 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"
       $ git squash --squash-msg @~3

AUTHOR
       Written by JesAos Espino	<jespinog@gmail.com>

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

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

				 November 2019			 GIT-SQUASH(1)

NAME | SYNOPSIS | DESCRIPTION | OPTIONS | EXAMPLES | AUTHOR | REPORTING BUGS | SEE ALSO

Want to link to this manual page? Use this URL:
<https://www.freebsd.org/cgi/man.cgi?query=git-squash&sektion=1&manpath=FreeBSD+12.1-RELEASE+and+Ports>

home | help