Thread (1 message) 1 message, 1 author, 2016-06-15

Re: git merge --squash isn't "marked as a merge"??

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:04

"Peter Valdemar Mørch (Lists)"  [off-list ref] writes:
Newbie alert:

I have a feature branch where I have N tiny commits with sloppy/private
commit messages....
Probably you would want to step back and _think_ why you want to squash in
the first place.  I suspect the answer would lead to a better use of the
available set of tools, such as "use 'rebase -i' to clean up the original
history and then 'merge' (without squash) it or 'rebase' it".
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help