Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match_all(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 717

Warning: Invalid argument supplied for foreach() in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 718

Warning: preg_replace(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 722

Warning: preg_match_all(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 717

Warning: Invalid argument supplied for foreach() in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 718

Warning: preg_replace(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 722

Warning: preg_match_all(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 717

Warning: Invalid argument supplied for foreach() in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 718

Warning: preg_replace(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 722

Warning: preg_match_all(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 717

Warning: Invalid argument supplied for foreach() in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 718

Warning: preg_replace(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 722

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739
Developer Infos - Netatalk Wiki

Developer Infos


Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739
From Netatalk Wiki
Jump to: navigation, search
(Main Netatalk Branches)
(Basic Netatalk Git)
Line 54: Line 54:
 
   origin/branch-netatalk-2-0
 
   origin/branch-netatalk-2-0
 
   origin/branch-netatalk-2-1
 
   origin/branch-netatalk-2-1
   origin/develop
+
   origin/branch-netatalk-2-2
 +
  origin/branch-netatalk-3-0
 +
  origin/branch-netatalk-3-1
 
   origin/master
 
   origin/master
  origin/product-2-2
 
 
</pre>
 
</pre>
  
 
Creating your own working branch from master:
 
Creating your own working branch from master:
   $ git checkout -b my_branch origin/develop
+
   $ git checkout -b my_branch
 
   Branch my_branch set up to track remote branch refs/remotes/origin/develop.
 
   Branch my_branch set up to track remote branch refs/remotes/origin/develop.
 
   Switched to a new branch "my_branch"
 
   Switched to a new branch "my_branch"
Line 96: Line 97:
  
 
Now fetch the remote branch history:
 
Now fetch the remote branch history:
   $ git fetch  
+
   $ git fetch
 
+
Merging remote branch changes:
+
  $ git merge origin/develop
+
  ...
+
  
 
To present your patchset properly to other developers, please rebase your patches against the branch you are developing against:
 
To present your patchset properly to other developers, please rebase your patches against the branch you are developing against:
   $ git rebase origin/develop
+
   $ git rebase origin/master
Obviously replace "origin/develop" by whatever branch you are developing against. If you have created a mess in your local patch queue, "git rebase -i" might help you out.
+
Obviously replace "origin/master" by whatever branch you are developing against. If you have created a mess in your local patch queue, "git rebase -i" might help you out.
  
 
== Creating patches ==
 
== Creating patches ==

Revision as of 07:37, 15 February 2014

Personal tools
Namespaces
Variants
Actions
Navigation
Toolbox