Tag Archives: commit

Git and Cherries

0
Posted by Üstün on 0x20100302 – 19:21
Filed under Development
Tagged as , ,

Today I needed to pick some specific changes from a local git branch and merge them to another. git cherry-pick does the job.

Usage:

git log source_local_branch #check the sha1 hash of the commit we want
git checkout destination_local_branch #switch to the branch we want to merge the commit.
git cherry-pick -x <commit_id>

the -x parameter adds the original commit id to the commit message.



				
				
			



			

				
Temporarily excluding files from Subversion commit


				                
4

                 

				

				

					Posted by Üstün on 0x20090222 – 20:24
				

				

					Filed under Development
												

							Tagged as , , , 				
				
				


Recently I needed a convenient way to exclude some files from an svn commit. All the googling I made returned suggestions to use svn:ignore property but that was not what I was looking for. I need to keep some versioned files from committing.  Later on, I decided to practice some bash programming and made a small script which does what I want. Here it comes, in case anybody else needs it too.




				
				
			



			

		

		
	        

	



	

	







WordPress Mobile Themes