From: Steve Prybylx <sa.pr...@gmail.com>
To: voidlinux <void...@googlegroups.com>
Subject: Re: howto to sqash files only on remote repo ?
Date: Fri, 18 Sep 2015 19:41:44 -0700 (PDT) [thread overview]
Message-ID: <7fb8b059-57a9-4863-8698-66469db84b93@googlegroups.com> (raw)
In-Reply-To: <c256bbd0-6fb4-443d-bbeb-5564822418d8@googlegroups.com>
[-- Attachment #1.1: Type: text/plain, Size: 1623 bytes --]
I usually keep my master branch clean and only use it for pulling from
upstream.
> git pull upstream master
When I want to, for example, contribute a new package, I will create a new
branch from master. I usually name it after the package I'm creating. So,
From my master branch:
> git checkout -b newpkg
If some time has passed since I've started, A day or two:
> $ git pull --rebase upstream master
When I think my package is ready for a pull request:
> git commit -m "New package: newpkg-version
git push -u origin newpkg
If there are errors, fix them and then:
> git commit --amend
git push -f
Anyways, this is my usual workflow. Hope this helps!
On Thursday, September 17, 2015 at 3:21:28 AM UTC-4, Pierre Bourgin wrote:
>
> Hello there,
>
> I'm newbie with git.
> I try to pull requests to void-packages (offer new packages) in a nice way
> for the rewiever, ie with only one changeset.
>
> So I carefully read the usefull doc of PullMoll about git :
>
> https://github.com/voidlinux/documentation/wiki/How-to-use-git,-by-@pullmoll
>
> My question: Is there a chance to keep the distinct commits (several) in
> my local repo, but combine them into a single changeset in my remote github
> repo ("origin") ?
>
> I used "git rebase -i" on my local repo (squash) then push to remote.
> So remote repo will contains a single changeset as expected ...
> And there is only ONE changeset too in my local repo, since the "rebase"
> happens on my local repo first.
>
> I've read various doc, but did not find anyhting like "git push --rebase"
> for instance.
>
> Any clue ?
>
> Thanks - Pierre
>
[-- Attachment #1.2: Type: text/html, Size: 3860 bytes --]
next prev parent reply other threads:[~2015-09-19 2:41 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 [this message]
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=7fb8b059-57a9-4863-8698-66469db84b93@googlegroups.com \
--to="sa.pr..."@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).