Sunday, September 1, 2013

How to rename a branch in git

Recently, I have come across to a need to rename an existing git branch. I googled and found the way to do it. Basically, it's a three step procedure.

First, we rename the old branch into the new one.
git branch -m master master-old
Then we will remove the old branch from the remote repository.
git push remote :master # delete master
And now we push our newly created branch to the repository.
git push remote master-old # create master-old on remote




See the book OpenCart 1.4 Template Design Cookbook.
See the book Joomla Mobile Development Beginners Guide




List of my works:

Opencart Extensions:

  1. Product Based Quantity Wise Shipping: Find it here.
  2. OpenSSLCOMMERZ: integrate SSLCOMMERZ with opencart: Find it here.
  3. Fine Search v.1.0 - Improves Opencart search feature to find relevant: Find it here.
  4. Opensweetcaptcha - An easy way to generate attractive captcha for your system!: Find it here.
  5. Custom Field Product - add unlimited custom fields to the product form: Find it here.
  6. Formcaptcha - add captcha on the register page: Find it here.

My Books:

  1. OpenCart 1.4 Template Design Cookbook.
  2. Joomla Mobile Development Beginners Guide

truncate html with tags

I was working on truncating rich contents on HTML editors. On the server side, we need to count the number of characters, then we need to truncate the string with keeping the HTML tags intact.

There is a class to truncate a rich text on the specific number of character or word number: http://www.pjgalbraith.com/2011/11/truncating-text-html-with-php/. This class uses php's DOMDocument. It parses each DOM element and count the characters appropriately. I have updated the pattern in the regular expression to allow all non space characters.
preg_match_all('/[\d\w ]+/us',$newEle->textContent,$m);
The textContent method only returns the text contents within a DOM.



See the book OpenCart 1.4 Template Design Cookbook.
See the book Joomla Mobile Development Beginners Guide




List of my works:

Opencart Extensions:

  1. Product Based Quantity Wise Shipping: Find it here.
  2. OpenSSLCOMMERZ: integrate SSLCOMMERZ with opencart: Find it here.
  3. Fine Search v.1.0 - Improves Opencart search feature to find relevant: Find it here.
  4. Opensweetcaptcha - An easy way to generate attractive captcha for your system!: Find it here.
  5. Custom Field Product - add unlimited custom fields to the product form: Find it here.
  6. Formcaptcha - add captcha on the register page: Find it here.

My Books:

  1. OpenCart 1.4 Template Design Cookbook.
  2. Joomla Mobile Development Beginners Guide

How to "Merge" Specific Files from Another Branch

Sometimes, we need to merge some specific files to a central working branch from our feature local branches. At that time, we also don't want to move all the changed files from our local workplace.

Here, we need a way to bring only our needed files from that branch.

First of all, we will be in the destination branch.
git checkout source_branch ...
We can simply give git checkout the name of the feature branch and the paths to the specific files that we want to add to our master branch.



See the book OpenCart 1.4 Template Design Cookbook.
See the book Joomla Mobile Development Beginners Guide




List of my works:

Opencart Extensions:

  1. Product Based Quantity Wise Shipping: Find it here.
  2. OpenSSLCOMMERZ: integrate SSLCOMMERZ with opencart: Find it here.
  3. Fine Search v.1.0 - Improves Opencart search feature to find relevant: Find it here.
  4. Opensweetcaptcha - An easy way to generate attractive captcha for your system!: Find it here.
  5. Custom Field Product - add unlimited custom fields to the product form: Find it here.
  6. Formcaptcha - add captcha on the register page: Find it here.

My Books:

  1. OpenCart 1.4 Template Design Cookbook.
  2. Joomla Mobile Development Beginners Guide