From: Pierre Bourgin <pbou...@gmail.com>
To: voidlinux <void...@googlegroups.com>
Subject: Re: howto to sqash files only on remote repo ?
Date: Fri, 18 Sep 2015 17:29:04 -0700 (PDT) [thread overview]
Message-ID: <9454d94a-03f8-4004-bd4e-4a95ae50e903@googlegroups.com> (raw)
In-Reply-To: <c256bbd0-6fb4-443d-bbeb-5564822418d8@googlegroups.com>
[-- Attachment #1.1: Type: text/plain, Size: 513 bytes --]
I feel alone with this problem, probably because I missunderstood something
the way git works !
So far, the only workaround I see is to use an intermediate local branch to
perform the rebase/squash stuff:
- branch local/mybranch.local :
keep all my (internal) history
- branch local/mybranch :
will receive a merge from mybranch.local
then perform a rebase/squash on it
then push it onto my github/mybranh (public repo)
- branch github/mybranch:
ready to be used for pull request to void-packages.
Pierre
[-- Attachment #1.2: Type: text/html, Size: 577 bytes --]
next prev parent reply other threads:[~2015-09-19 0:29 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 [this message]
2015-09-19 2:41 ` Steve Prybylx
2015-09-19 3:19 ` Steve Prybylx
2015-09-19 19:40 ` Stefan Mühlinghaus
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=9454d94a-03f8-4004-bd4e-4a95ae50e903@googlegroups.com \
--to="pbou..."@gmail.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).