Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision Last revision Both sides next revision | ||
|
git:gitconfig [2009/02/19 00:43] janakj |
git:gitconfig [2009/04/16 17:24] 212.227.35.68 |
||
|---|---|---|---|
| Line 17: | Line 17: | ||
| # The file below contains a list of patterns to match Emacs backup and | # The file below contains a list of patterns to match Emacs backup and | ||
| # temporary files (note that you need to provide full path to the file | # temporary files (note that you need to provide full path to the file | ||
| - | # because git would not expand ~). | + | # because git would not expand ~). Uncomment the following option if you |
| - | excludesfile = / | + | |
| + | #excludesfile = / | ||
| [format] | [format] | ||
| Line 103: | Line 104: | ||
| # another branch was merged. I find this easier to understand and read in | # another branch was merged. I find this easier to understand and read in | ||
| # the log. | # the log. | ||
| - | mergeoptions = --no-commit --no-ff | + | |
| + | mergeoptions = --no-ff | ||
| Line 152: | Line 154: | ||
| tagopt = --no-tags | tagopt = --no-tags | ||
| </ | </ | ||
| + | |||
| + | Some of the options were not so easy to figure out, so I decided to share the | ||
| + | config file to make your git learning curve less steep than mine was (and is | ||
| + | :-). The file is well commented. | ||
| + | |||
| + | Save the configuration file in '' | ||
| + | address to your real name and real email address. After that you get your copy | ||
| + | of the sip-router repository using: | ||
| + | < | ||
| + | mkdir my_repo | ||
| + | cd my_repo | ||
| + | git init | ||
| + | git fetch sr | ||
| + | </ | ||
| + | You have pulled the whole history when the last command finished. " | ||
| + | shorthand for the sip-router git repository. | ||
| + | |||
| + | As the next step you can check out the master branch, this is where the most | ||
| + | recent source code is (it is an equivalent of the trunk in svn or HEAD in cvs): | ||
| + | < | ||
| + | git co -b master sr/master | ||
| + | </ | ||
| + | " | ||
| + | file. | ||
| + | |||
| + | So now you have your very own copy of the sip-router repository, but that's | ||
| + | not all, you can also pull the whole kamailio repository into it: | ||
| + | < | ||
| + | g fetch km | ||
| + | </ | ||
| + | " | ||
| + | command will produce a lot of output (don't be scared) and after it finishes | ||
| + | you will have the full history of both projects--sip-router and kamailio--in | ||
| + | your local git repository. You can, for example, check out kamailio svn trunk | ||
| + | using: | ||
| + | < | ||
| + | git co -b kam_trunk km/trunk | ||
| + | </ | ||
| + | And now you have the sources from kamailio trunk in your working directory. | ||
| + | |||
| + | You can, of course do the same for SER from CVS, to get the latest sources of | ||
| + | ser: | ||
| + | < | ||
| + | git fetch cvs | ||
| + | </ | ||
| + | " | ||
| + | switch to cvs trunk using: | ||
| + | < | ||
| + | git co -b cvs_trunk cvs/ | ||
| + | </ | ||
| + | And now you have the latest ser sources in your working directory. | ||
| + | |||
| + | And the last repository you can fetch from is the opensips git import: | ||
| + | < | ||
| + | git fetch os | ||
| + | git co -b opensips_trunk os/trunk | ||
| + | </ | ||
| + | And you have the latest sources from opensips trunk. | ||
| + | |||
| + | To display all branches from all repositories run: | ||
| + | < | ||
| + | git branch -a | ||
| + | </ | ||
| + | The most important branches are: | ||
| + | |||
| + | * '' | ||
| + | * '' | ||
| + | * '' | ||
| + | * '' | ||
| + | * '' | ||
| + | |||
