Tif Pun TifPun

## Git cheatsheet.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                TifPun
                / Git cheatsheet.md
            
            
              Last active
              March 30, 2017 21:23
            
              
                Git cheatsheet
              
          
    Checkout branch without detaching from head

git fetch
git --track branchName origin/branchName
Merge from branchA to branchB locally

git checkout branchB
git merge branchA

  
## zip files and folders using node-archiver.js
/*
 Pre-requisite: npm --save archiver

 Suppose the folder `/Users/x/baseFolder` has the following structure:
 /Users/x/baseFolder
 | __ dir1
   | __ file1.txt
   | __ file2.txt
 | __ dir2
   | __ file3.txt
	/*
	Pre-requisite: npm --save archiver

	Suppose the folder `/Users/x/baseFolder` has the following structure:
	/Users/x/baseFolder
	\| __ dir1
	\| __ file1.txt
	\| __ file2.txt
	\| __ dir2
	\| __ file3.txt