On Thursday, 21 May 2015 at 10:42:34 UTC, Rikki Cattermole wrote:
> On 21/05/2015 10:39 p.m., ZombineDev wrote:
>> Basically you need clone your fork to your computer, add a "upstream"
>> remote to github.com/D-Programming-Language/[repo name, eg. phobos],
>> pull from upstream the new changes and optionally update github by
>> pushing to origin (origin normally is github).
>> It may sound complicated doing this from the command-line, but after a
>> few times you'll get used to it.
>
>
> Or for Windows/OSX you can use SourceTree.
> It is amaaaaaaaaaaaaazing!
>
> https://www.sourcetreeapp.com/

yup and amazingly unstable and slow on windows too, yaay

On Thursday, 21 May 2015 at 13:30:49 UTC, Baz wrote:
> On Thursday, 21 May 2015 at 10:42:34 UTC, Rikki Cattermole wrote:
>> On 21/05/2015 10:39 p.m., ZombineDev wrote:
>>> Basically you need clone your fork to your computer, add a "upstream"
>>> remote to github.com/D-Programming-Language/[repo name, eg. phobos],
>>> pull from upstream the new changes and optionally update github by
>>> pushing to origin (origin normally is github).
>>> It may sound complicated doing this from the command-line, but after a
>>> few times you'll get used to it.
>>
>>
>> Or for Windows/OSX you can use SourceTree.
>> It is amaaaaaaaaaaaaazing!
>>
>> https://www.sourcetreeapp.com/
>
> i'm a bit less enthusiast than you about this soft even if i use to be:
>
> + easy commits: push/pull/commit
> + easy branches: switch/create/delete
> + easy remotes: manage different sources (e.g official & your forks)
>
> - more complex things, squash, rebase, still have to use the console.
> - big repositories are slow to open/refresh/switch branch
> - several times ST has completly ruined my local repositories.
> - it's a nightmare with any repos based on many sub repositories.
> - it doesn't use *libgit*, but *git* executable itself, and it doesn't seem to balance well multiple instances among the cores.
>
> Still the best git GUI but it has some obvious problems and bugs.

replied b4 reading this..
so +1

On Thursday, 21 May 2015 at 13:40:22 UTC, Rikki Cattermole wrote:
> On 22/05/2015 1:30 a.m., Baz wrote:
>> Still the best git GUI but it has some obvious problems and bugs.
>
> IMO making a good UI for VC is hard. As you said even SourceTree isn't perfect.
>
> If only somebody could make a better cross platform one.

OMFG It's there !!

https://www.gitkraken.com/

Almost all what I could reproach to SourceTree is fine in Kraken !!
And it's truely cross-platform.

The only thing I have'nt tested yet is rebasing but most of the time I'll only need to ammend previous commit, anyway so far for me Kraken is a bit over ST.

On Thursday, 21 May 2015 at 10:39:46 UTC, ZombineDev wrote:
> Basically you need clone your fork to your computer, add a "upstream" remote to github.com/D-Programming-Language/[repo name, eg. phobos], pull from upstream the new changes and optionally update github by pushing to origin (origin normally is github).
> It may sound complicated doing this from the command-line, but after a few times you'll get used to it.

Please put this information somewhere. Due to the fear of being told to squash commits, I do not want to do any commits anymore.

On Tuesday, 19 April 2016 at 13:05:35 UTC, tcak wrote:
> On Thursday, 21 May 2015 at 10:39:46 UTC, ZombineDev wrote:
>> Basically you need clone your fork to your computer, add a "upstream" remote to github.com/D-Programming-Language/[repo name, eg. phobos], pull from upstream the new changes and optionally update github by pushing to origin (origin normally is github).
>> It may sound complicated doing this from the command-line, but after a few times you'll get used to it.
>
> Please put this information somewhere. Due to the fear of being told to squash commits, I do not want to do any commits anymore.

If all you need to do is squash commits, just `git rebase -i HEAD~N` where N is some number at least as big as the number of commits back that you're interested in messing around with then read the instructions that will appear. Once you're done, `git push --force` to update your branch.

I would recommend making a copy of the whole repository locally before any of that just in case you mess something up, at least while you're not as confident with git.

On 19/04/2016 11:05 PM, tcak wrote:
> On Thursday, 21 May 2015 at 10:39:46 UTC, ZombineDev wrote:
>> Basically you need clone your fork to your computer, add a "upstream"
>> remote to github.com/D-Programming-Language/[repo name, eg. phobos],
>> pull from upstream the new changes and optionally update github by
>> pushing to origin (origin normally is github).
>> It may sound complicated doing this from the command-line, but after a
>> few times you'll get used to it.
>
> Please put this information somewhere. Due to the fear of being told to
> squash commits, I do not want to do any commits anymore.

It's in the wiki.

On Tuesday, 19 April 2016 at 13:05:35 UTC, tcak wrote:
> On Thursday, 21 May 2015 at 10:39:46 UTC, ZombineDev wrote:
>> Basically you need clone your fork to your computer, add a "upstream" remote to github.com/D-Programming-Language/[repo name, eg. phobos], pull from upstream the new changes and optionally update github by pushing to origin (origin normally is github).
>> It may sound complicated doing this from the command-line, but after a few times you'll get used to it.
>
> Please put this information somewhere.

Is the information written here (http://wiki.dlang.org/Starting_as_a_Contributor) helpful?

> Due to the fear of being told to squash commits, I do not want to do any commits anymore.

There's no need to worry. I'm sure all of the contributors would be happy to help you if you run into problems.

On Tuesday, 19 April 2016 at 13:34:24 UTC, John Colvin wrote:
> On Tuesday, 19 April 2016 at 13:05:35 UTC, tcak wrote:
>
> I would recommend making a copy of the whole repository locally before any of that just in case you mess something up, at least while you're not as confident with git.

Isn't it enough to just:

git branch before-rebase

(You can also add -f to replace an existing backup branch).