Re: [git-users] Re: setup git over http

2016-12-09 Thread Rick Umali
On Friday, December 9, 2016 at 1:58:33 AM UTC-5, Vivek Patil wrote:

> But I want my own on AWS only with http or ssh option line github
>

Yes. With GitLab community edition (https://about.gitlab.com/downloads/), I 
believe 
that is what you will have. You would install GitLab on an AWS server, and 
then make
that server available to your audience.

Good luck!
--
Rick Umali

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[git-users] Re: merge orginal with fork

2016-12-09 Thread Charlie Oehlrich
github support staff said that github automatically creates it and i have 
to use git shell (which from what i can tell uses the same  commands as git)

On Wednesday, December 7, 2016 at 3:55:29 PM UTC+13, Charlie Oehlrich wrote:
>
> it is currently like this
>
> master = A-B-C-D
>
> branch-2 = E-F-G
>
> branch-3 = H-I-J-K
>
> G is both of these commits in the original repositry: 
> https://github.com/Lunatrius/Schematica/commit/3ee0f93def0c13d021d98815861a77665d31df04
>  
> and 
> https://github.com/Lunatrius/Schematica/commit/3ee0f93def0c13d021d98815861a77665d31df04
>  
> (it also says it is a merge commit) with my user name
>
> L is the first commit with the username for the original repositry
>
> M is the second commit with the username for the original repositry
>
> and i want to make it like this:
>
> master = A-B-C-D
>
> branch-2 = E-F-L-M
>
> branch-3 = H-I-J-K
>
> (for what it currently is that is what it looks like on github desktop and 
> on the website it has for branch-2 it has E-F-L-M-G also for G it has the 
> exact same things as L and M)
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.