[git-users] How to Move from Dropbox to Git

2017-08-29 Thread Ray Joseph
Our team is using Dropbox and we want to change to Git. I have seen many articles on how to use them together, but not how to transition. Is it possible to capture the Dropbox versioning over to a new Git repo? -- You received this message because you are subscribed to the Google Groups "Git

Re: [git-users] Bringing back botched history in a rebaseable state

2017-08-29 Thread Philip Oakley
Marc, The other aspect is that 'rebase' does not always play well with merges. It (rebase) was designed to handle just a single feature branch, not one that has merges within it. Philip - Original Message - From: "Konstantin Khomoutov" To:

Re: [git-users] Is it possbile to achive GIT Workflow with advanced access controll

2017-08-29 Thread Philip Oakley
I'm going to be a bit bold, but at the moment there is no regular way to achieve this. Git was developed for the open source community, so "Open" is at the core of the design. Git doesn't do access control. I've not used Gitolite which apparently does provide some repo level control. There is

Re: [git-users] Bringing back botched history in a rebaseable state

2017-08-29 Thread Konstantin Khomoutov
On Mon, Aug 28, 2017 at 12:28:57PM +0200, Marc Haber wrote: > > > But when I try to git rebase fan upon master, I get the same file that > > > is even in the diff between msater and fan over and over again. I guess > > > that git rebase goes back to commit 2357bcc where fan was branched off > > >