[git-users] Best way to make a step-by-step tutorial using Git

2014-03-27 Thread Olivier Revollat
Hello, i would like to make a PHP development tutorial and it's basically a 
step by step approach : code from lesson n is based on code from lesson n - 
1
I've seen some tutorial like this who uses pull request or branches so the 
students can checkout branches or look at the pull request to progress step 
by step in the lessons.

I just want to know which is (for you) the more practical way to do this ? 
PR ? Tags ? Branches ? something else ?

Thanks :)

-- 
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: CM Synergy to Git conversion utility

2014-03-27 Thread Rasmus Voss
You can contact the guys from  http://switch-gears.dk/ they have done a 
major conversion for Nokia 


On Monday, October 7, 2013 7:04:10 AM UTC+2, Pankaj Gupta wrote:

 Hi,

 I'm looking for a CM synergy to GIT conversion utility. 

 Once i know all available utilities in market, i shall look at which one 
 suits best. Currently i know if PySynergy (
 https://github.com/emanuelez/PySynergy) but did not really use it.

 Thanks for help,
 -Pankaj


-- 
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.


Re: [git-users] rsync instead of git clone and merging

2014-03-27 Thread Rodrigo Gularte Mérida
Merci !


On Wed, Mar 26, 2014 at 5:48 PM, Jean-Rene David git-us...@levelnine.netwrote:

 * Rodrigo Gularte Mérida [2014.03.26 12:25]:
 [...]
 gmol16:~ rjgularte$ cd giga/tgv/
 gmol16:tgv rjgularte$ git merge ~/tgv/
 merge: /Users/rjgularte/tgv/ - not something we can merge

 You can't directly merge directories that way. If
 you want your repositories to know about each
 other, you need to make that explicit.

 So let's say we call your local repo 'local-tgv'
 and your remote repo 'remote-tgv'. If you want to
 pull changes from remote-tgv into local-tgv, you
 need to first tell git:

 ~/tgv $ cd ~/tgv
 ~/tgv $ git remote add remote-tgv ~/giga/tgv

 Now that it has a name, you can fetch the content
 of remote-tgv:

 ~/tgv $ git fetch remote-tgv

 Now you should be able to see the branches in
 remote-tgv while in local-tgv by typing:

 ~/tgv $ git branch -a
 * master
   remotes/remote-tgv/master

 (I'm assuming the branch in local-tgv and
 remote-tgv are both named 'master'. It's the
 default branch name.)

 And finally you can merge.

 ~/tgv $ git merge remote-tgv/master

 --
 JR

 --
 You received this message because you are subscribed to a topic in the
 Google Groups Git for human beings group.
 To unsubscribe from this topic, visit
 https://groups.google.com/d/topic/git-users/2i2cxe8TaaU/unsubscribe.
 To unsubscribe from this group and all its topics, send an email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit https://groups.google.com/d/optout.


-- 
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] Controlling where submodules are recorded?

2014-03-27 Thread Magnus Therning
I've just started taking a closer look at vcsh for keeping my
dot-files in git.  Currently I'm keeping them all in a single git
repo, which I check out straight into my $HOME (i.e. I have a
$HOME/.git).  I think I like the approach of vcsh better, but there is
one little detail that I can't seem to work out: how can I control
where submodules are recorded?

I have a few submodules in my $HOME for the solarized colour scheme:


[submodule .solarized/gnome-terminal-colors-solarized]
path = .solarized/gnome-terminal-colors-solarized
url = https://github.com/sigurdga/gnome-terminal-colors-solarized.git
[submodule .solarized/ls-colors-solarized]
path = .solarized/ls-colors-solarized
url = https://github.com/sigurdga/ls-colors-solarized.git
[submodule .solarized/mutt-colors-solarized]
path = .solarized/mutt-colors-solarized
url = https://github.com/altercation/mutt-colors-solarized.git


I would like to record them in separate vcsh-repos, so that the colour
schemes are kept in the most obvious repo, e.g. the mutt colour scheme
is a submodule of ~/.config/vcsh/repo.d/mutt.git.  But I can't find
any way to tell `git submodule` where to record the information, it
always uses $GIT_WORK_TREE/.gitmodules.  Is there something I've
missed here?

/M

I am aware I could just skip using submodules, just clone them, and
then use something like `mr` to keep them up-to-date.  The only limit
is I'd like to be able to use it in cygwin too.

-- 
Magnus Therning  OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

In a hierarchy, every employee tends to rise to his level of incompetence.
 -- The Peter Principle


pgp_HyMdNWmEk.pgp
Description: PGP signature