Difference between revisions of "Git"
Pdherbemont (talk | contribs) (Submitting patch.) |
Pdherbemont (talk | contribs) m |
||
Line 27: | Line 27: | ||
== Creating a secondary local branch == | == Creating a secondary local branch == | ||
− | If you want to work on a specific project that could require a branch of the trunk | + | If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing: |
$ git branch mywork | $ git branch mywork | ||
− | to actually use it | + | and to actually use it do: |
$ git checkout mywork | $ git checkout mywork | ||
− | Then do some commit on it | + | |
+ | Then do some commit on it... | ||
+ | |||
$ git checkout master | $ git checkout master | ||
to go back to your normal branch | to go back to your normal branch |
Revision as of 20:46, 12 April 2007
Contents
Getting VLC source code via Git
git clone git://git.videolan.org/vlc.git
You can also browse the sources via gitweb.
Configure your local git repository
Tell git your name. (used by mostly by git-commit)
$ git repo-config user.name "Your Name" $ git repo-config user.email "me@example.com"
List the local branch
You can now list your local branch by doing
$ git branch
which should ouput
$ git branch * master
Commit
Now you can start to work on your tree. As soon as you feel you've reached a step in developement you can commit locally your work by
$ git commit -a
or
$ git commit <specific files>
Keeping your local working branch in sync
$ git fetch origin $ git rebase origin
voilà! Your commit will be re-applied on top of the origin (the svn trunk).
Creating a secondary local branch
If you want to work on a specific project that could require a branch of the trunk, create a local branch of the current branch by doing:
$ git branch mywork
and to actually use it do:
$ git checkout mywork
Then do some commit on it...
$ git checkout master
to go back to your normal branch
Submitting patches to the vlc-devel
If you have been developing on vlc locally and (still) don't have write access to it you can submit all your commit in one shot using:
$ git format-patch -o out origin
which will produce the patches for each local commit in the directory "out", or by using
$ git format-patch --stdout --attach -n origin | git-imap-send
which will directly produces the emails and store them in a imap mail box, provided that you have properly set up git-imap-send.