From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: Re: git merge --squash isn't "marked as a merge"??
Date: Tue, 29 Jul 2008 01:53:55 -0700 [thread overview]
Message-ID: <7vbq0hhxzw.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <488ECB89.5060801@sneakemail.com> (Peter Valdemar Mørch's message of "Tue, 29 Jul 2008 09:49:29 +0200")
"Peter Valdemar Mørch (Lists)" <4ux6as402@sneakemail.com> 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".
prev parent reply other threads:[~2008-07-29 8:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-29 7:49 git merge --squash isn't "marked as a merge"?? "Peter Valdemar Mørch (Lists)"
2008-07-29 8:53 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vbq0hhxzw.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.