Developer Infos

From Netatalk Wiki
Jump to: navigation, search
m (spelling fix)
Line 38: Line 38:
  
 
   $ git branch -r
 
   $ git branch -r
  origin/HEAD -> origin/master
 
  origin/branch-1-5-prep
 
  origin/branch-allea
 
  origin/branch-aurp
 
  origin/branch-compose-sp
 
  origin/branch-netatalk-1-6
 
 
   origin/branch-netatalk-2-0
 
   origin/branch-netatalk-2-0
 
   origin/branch-netatalk-2-1
 
   origin/branch-netatalk-2-1
   origin/branch-netatalk-2-2-0
+
   origin/develop
  origin/branch-netatalk-CNID-refactored
+
  origin/branch-netatalk-afp-3x
+
  origin/branch-netatalk-afp-3x-dev
+
 
   origin/master
 
   origin/master
   origin/origin
+
   origin/product-2-2
  origin/vendor
+
 
</pre>
 
</pre>
  
 
Creating your own working branch from master:
 
Creating your own working branch from master:
   $ git checkout -b my_branch origin/master
+
   $ git checkout -b my_branch origin/develop
   Branch my_branch set up to track remote branch refs/remotes/origin/master.
+
   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 95: Line 85:
  
 
Merging remote branch changes:
 
Merging remote branch changes:
   $ git merge origin/master
+
   $ 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/master
+
   $ git rebase origin/develop
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.
+
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.
  
 
== Creating patches ==
 
== Creating patches ==
Line 110: Line 100:
 
This will create three patch files in your current directory that you can then send to the samba-technical mailing list.
 
This will create three patch files in your current directory that you can then send to the samba-technical mailing list.
  
Note that if you have a number of patches against a specific branch and don't feel like counting them, the following works as well (e.g. against the master branch):
+
Note that if you have a number of patches against a specific branch and don't feel like counting them, the following works as well (e.g. against the develop branch):
  
   $ git format-patch origin/master
+
   $ git format-patch origin/develop
  
This will create one patch file for every patch that is in your local branch but not in origin/master.
+
This will create one patch file for every patch that is in your local branch but not in origin/develop.
  
 
If you have more patches which belong together it's sometimes useful to export them into one file:
 
If you have more patches which belong together it's sometimes useful to export them into one file:
  
   $ git format-patch --stdout origin/master > master-featureX-01.patches.txt
+
   $ git format-patch --stdout origin/develop > develop-featureX-01.patches.txt
  
 
== FAQ ==
 
== FAQ ==

Revision as of 12:09, 28 March 2012

Personal tools
Namespaces
Variants
Actions
Navigation
Toolbox