From mboxrd@z Thu Jan 1 00:00:00 1970 Date: Fri, 18 Sep 2015 17:29:04 -0700 (PDT) From: Pierre Bourgin To: voidlinux Message-Id: <9454d94a-03f8-4004-bd4e-4a95ae50e903@googlegroups.com> In-Reply-To: References: Subject: Re: howto to sqash files only on remote repo ? MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_2591_1166576911.1442622544710" ------=_Part_2591_1166576911.1442622544710 Content-Type: multipart/alternative; boundary="----=_Part_2592_215027102.1442622544710" ------=_Part_2592_215027102.1442622544710 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 ------=_Part_2592_215027102.1442622544710 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit
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
------=_Part_2592_215027102.1442622544710-- ------=_Part_2591_1166576911.1442622544710--