Re: howto to sqash files only on remote repo ?

[Steve Prybylx <sa.pr...@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1578 bytes --]

I forgot an important step in there:

> git add srcpkgs/newpkg/

before the 

> git commit -m "New package: newpkg-version"


If your a complete newbie at git and your just making minor changes for a 
new package, I would probably suggest just using:

> git commit --amend 

 After each change. 

But, to answer your question about "squashing" some commits, You may want 
to try:

> git log

 
To find the hash of the "New package: newpkg" commit. We'll say it's 
'1234567...' (usually you just need the first 7 characters)

> git reset 1234567

 
That will reset 'HEAD', Then:

> git add srcpkgs/newpkg/

git commit --amend 

 

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: 3877 bytes --]