From: "Stefan Mühlinghaus" <"master..."@googlemail.com>
To: voidlinux <void...@googlegroups.com>
Subject: Re: howto to sqash files only on remote repo ?
Date: Sat, 19 Sep 2015 12:40:11 -0700 (PDT) [thread overview]
Message-ID: <108e1462-365b-4b93-b8c7-c276eebc1bff@googlegroups.com> (raw)
In-Reply-To: <c256bbd0-6fb4-443d-bbeb-5564822418d8@googlegroups.com>
[-- Attachment #1.1: Type: text/plain, Size: 380 bytes --]
I am not an expert git user myself, but as far as I know using a new local
branch with the squashed commits is the only feasable way to preserve your
complete commit history. There may be other ways which would probably be
even more tricky to use.
Having a local and remote branch that differ in commits and are not
supposed to be merged is simply not inteded git behaviour.
[-- Attachment #1.2: Type: text/html, Size: 420 bytes --]
prev parent reply other threads:[~2015-09-19 19:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-17 7:21 Pierre Bourgin
2015-09-19 0:29 ` Pierre Bourgin
2015-09-19 2:41 ` Steve Prybylx
2015-09-19 3:19 ` Steve Prybylx
2015-09-19 19:40 ` Stefan Mühlinghaus [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=108e1462-365b-4b93-b8c7-c276eebc1bff@googlegroups.com \
--to="master..."@googlemail.com \
--cc="void..."@googlegroups.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).