esedic
3/28/2017 - 11:18 AM

work with joomla git using terminal

work with joomla git using terminal

Clone your forked repo in local.

Using Terminal

  1. For the very first time if you didn't configured remote repository then do it using this command.

     git remote add upstream git@github.com:joomla/joomla-cms.git
    
  2. Fetch changes from remote repository.

    git fetch upstream 
    
  3. Configure local working branch:

    git branch <new_local_branch_name> upstream/master
    git checkout <new_local_branch_name>
    

    or

    git merge upstream/master
    
  4. To Commit local branch

     git commit -a -m "Your commit message"
    
  5. Push you local branch on your Github Repository.

     git push origin <new_local_branch_name>
    

    If you want to push your local branch into new remote branch then

     git push origin <new_local_branch_name>:<remote_branch_name>
    

Discard uncommitted changes

    git checkout -- .
    
    git reset --hard

Applying a patch

  1. Download the patch to your working directory. Apply the patch with the following command:

     git apply -v [patchname.patch]
    
  2. To avoid accidentally including the patch file in future commits, remove it:

     rm [patchname.patch]
    

Remove *.orig files

    rm `find -name '*.orig' | xargs`