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
Thanks for replying to me.
Here is what I get from my home computer:
$ git branch -a
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
This answers my question.
On Apr 23, 12:58 am, Luuk Paulussen luuk.paulus...@gmail.com wrote:
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
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
// 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.
On Sunday, June 17, 2012 6:12:26 AM UTC-7, EricP wrote:
I've been working on a branch, say '2.1' and made a few
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
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
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?
On Thursday, September 20, 2012 10:06:37 AM UTC-4, EricP wrote:
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
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,
Mail list logo