Differences

This shows you the differences between two versions of the page.

--- git:kamailio-repository [2010/03/31 10:18]
andrei howto handle push failures, rebase and longer but safer commands
+++ git:kamailio-repository [2010/03/31 18:38] (current)
miconda
@@ Line 58: / Line 58: @@
 Fetch the development (master) branch with your developer account.
-Update the code, then do local commit:
+Update the code, then do the local commit. Note that small commits are preferred (more smaller commits are better then a huge commit touching multiple modules or
+adding multiple features or fixes). Please make sure you read first the [[devel:git-commit-guidelines|Git Commit Guidelines]] and the [[git:commit-into-master|Git Push into master HOWTO]]. If this is the first time you contribute code to the project then please read also [[:coding_style|Coding Style]].
 <code>
-git commit .
+git add files_that_you changes # use git status or git diff to see them
+git commit
 </code>
@@ Line 91: / Line 93: @@
 <code>
-git cherry-pick -x __commit_to_master_hash_id__
+git cherry-pick -x [commit_to_master_hash_id]
+</code>
+For example:
+<code>
+git cherry-pick -x 7b8b6f647365655afa210f5e95baef06398ef612
 </code>

Trace: