[git-users] Re: Git clone from GitHub, publish to Bitbucket, get updates from original repo

2014-03-13 Thread Thomas Ferris Nicolaisen
On Thursday, March 13, 2014 4:19:06 AM UTC+1, Tony George wrote: Hi, I have a bitbucket private repo for dotfiles. This contains files like .vimrc and so on. For Vim, I am using Pathogen. The plugins from GitHub are installed as Git Submodules. The instructions I used to set this up are

Re: [git-users] Re: git internal data structures. how do objects such as commit/tree/blob work?

2014-03-13 Thread Konstantin Khomoutov
On Wed, 12 Mar 2014 23:29:21 -0700 (PDT) rocky1989@gmail.com wrote: I want to write a program to store files as git does.But I can't understand how git works with its objects to do this job. I have read some git code but it's difficult to understand,I also read some books like

[git-users] Subtrees

2014-03-13 Thread Or Elimelech
Hi, I'm using git subtree on my project i did it by using. git remote -f add example https://www.example.com/example.git git checkout -b example example/master git read-tree --prefix=modules/example -u example/master How do I let other people on the project update the subtrees? as they do

Re: [git-users] Confused regarding master repo.

2014-03-13 Thread Magnus Therning
On Tue, Mar 11, 2014 at 03:27:39PM -0500, Chuck wrote: Err.. disregard I figured out how to use this in the manner we desire. Do you mind describing how you ended up using Git? It might help others to have your setup as an example. /M -- Magnus Therning OpenPGP:

Re: [git-users] Confused regarding master repo.

2014-03-13 Thread Chuck
Well havent completed deployed yet. But our plan is to create a bare metal repository on a central server, one repo per developer. On our central server: (all directories owned by a git user) mkdir username.git cd username.git git --bare init Then on local workstation or wherever: mkdir

[git-users] How come forced push resulted in other branch being moved back?

2014-03-13 Thread Yuri Kanivetsky
In fact, that's not me who did this, so I can't be sure what exactly he did. He had master and devel branches. He rebased devel onto master branch and did `git push -f`. Supposedly, push.default was set to matching and both branches were pushed. But now in the remote repository master is

Re: [git-users] How come forced push resulted in other branch being moved back?

2014-03-13 Thread Philip Oakley
Sounds like the user had not fetched the latest commits from the remote so that her/his local copy of that remote was behind and after the rebase he had lost those commits relative to the true remote, so when he force pushed his rebased branches the remote was rolled back. Philip [sorry for

Re: [git-users] How come forced push resulted in other branch being moved back?

2014-03-13 Thread Yuri Kanivetsky
Philip, none of the commits were lost. It's just that the master now points to the wrong commit. Also, it appears I misinterpreted the results of my script. It shows what might have happened. Supposedly, there were two things that made that happen: push.default were set to matching and master