[git-users] How to pull a branch on a remote repository when I don't have it locally

2009-04-17 Thread EricP
Hi, My question might seem a little dumb and I beg your pardon for that. I thought it would be natural to do what I wanted but it did not give the expected results. Hence my question on this group... I develop code at home and in a lab. I've setup a reference repository on a secured server to

[git-users] Re: How to pull a branch on a remote repository when I don't have it locally

2009-04-18 Thread EricP
Hi Dan, Thanks for replying to me. Here is what I get from my home computer: $ git branch -a * master network origin/master origin/network As you can see, there is nothing about the dij branch that is remote and that is But this is what I get from the computer at the lab: $ git branch

[git-users] Re: How to pull a branch on a remote repository when I don't have it locally

2009-04-23 Thread EricP
Thanks Luuk, This answers my question. - Eric On Apr 23, 12:58 am, Luuk Paulussen luuk.paulus...@gmail.com wrote: Hi Eric, You should be able to do: git fetch origin  #This should fetch all remote refs, including the remote origin/dij without updating anything locally. git checkout -b dij

[git-users] Re: Paper on Git to Write, suggestions sought!

2010-12-06 Thread EricP
Hi, Maybe a comparison with Mercurial (hg) would also be nice since it is, in many points, similar in use and philosophy to GIT. But mercurial is written in Python; for Windows users (and gui addicts) there is TortoiseHG, in the same era that TortoiseSVN (and TortoiseCVS, and ...). As I was

[git-users] Re: How to make a new branch with a portion of a branch?

2012-06-18 Thread EricP
tag2.1 --hard // revert selected commits in what will be 2.2 git co 2.2 git cherry-pick C..K But in this case, C-K in 2.2 branch will have new commit IDs. Daniel. On Sunday, June 17, 2012 6:12:26 AM UTC-7, EricP wrote: Hi, I've been working on a branch, say '2.1' and made a few

Re: [git-users] How to make a new branch with a portion of a branch?

2012-06-18 Thread EricP
Hi all, thanks for all you clever replies. Here's what I've done: $ git branch 2.2 tag2.1 $ git checkout 2.2 $ git merge 2.1 $ git checkout 2.1 $ git revert --no-commit sha-1 of all commits between tag2.1 and HEAD $ git commit -m Reverted what ought to be in branch 2.2 In that manner, all

[git-users] Re: Problem getting mergetool (kdiff3) to work

2012-09-20 Thread EricP
Hi, I'm running windows 7 / 64 bits. Here's my version of Git: $ git --version git version 1.7.11.msysgit.1 I installed KDiff3 version 0.9.96. I don't have any error message when I launch the mergetool: when a conflict occurs during a merge, I use this command: $ git mergetool but no sign of

[git-users] Re: Problem getting mergetool (kdiff3) to work

2012-09-20 Thread EricP
the user to resolve conflicts by hand. Pretty neat in my opinion. But I thought Git was equipped with cutting edge merge algorithms. Seems like KDiff3 has some complementary tools! Does that make sense? Eric On Thursday, September 20, 2012 10:06:37 AM UTC-4, EricP wrote: Hi, I'm running

[git-users] Any experience with git-p4 to interact with Perforce repositories?

2013-07-12 Thread EricP
Hi all, I'm a big Git fan and had the chance to convert some colleagues to the benefit of Git over Subversion, leading the conversion process and coaching them for their day-to-day use. I'm now working in a place where the VCS is Perforce (sigh!). I must admit the cultural gap is

[git-users] Problems migrating from Perforce to Git

2013-09-11 Thread EricP
Hi, My current workplace is using Perforce as its VCS. I and a few other guys would like to run a road test with using Git in our workflow instead. I already converted some SVN repositories into Git in my previous workplace and it went smoothly and my colleagues were, as far as I can tell,