How to deploy the code to shared host with git

Scenario

Magento 1 is end of life. I want to migrate an existing Mage repo to the latest from Magento - Long Term Support maintained by OpenMage .

Warning: the follow...

First, install git server in the machines. Then, install git client in local machine. After creating the remote and local repositories, the trick now is creating a hook in the remote servers to update the code change at the shell. Git hooks are sc...

I wrote some code in some files in a folder called AA. I have a repo in remote in Bitbucket. Here're the steps to link my local to remote using TortoiseGit:

1. Create a repo for the folder AA: Navigate to the folder in windows explorer and ri...

Deprecated method. Use this instead. See also [this](https://makandracards.com/kiat_git/485037-how-to-r...

Scenario

2 to 3 remote repositories in GitHub and 2 local repositories:

1. [GitHub] Go to an owner repository (eg OpenMage).
2. [GitHub] Fork owner's repository (from item 1).
3. [GitHub or BitBucket] Our application with custom code.
4. [Loca...

We use a process called pull request, or PR for short, to contribute to open source.

Prerequisites

We need a fork repo in our GitHub account and in our local machine. See this [guide](https://makandracards.com/kiat_git/68235-how-to-update-a-...

If I want to compare changes on a topic branch to master, I find it easiest and safest to do the following:

git checkout master
git checkout -b trial_merge
git merge topic_branch

After completing the merge, it is easy to see the cons...

Better way is use .gitattributes, see Merge Strategies

Use Case

If we use an open source in our project, e.g. [OpenMage](https://github.com/OpenMage/magento-l...

"git is not a deployment tool, so don't do that"

http://gitolite.com/deploy.html

Set up SSH keys

The following setup the SSH for root so we can use SSH to bitbucket when login as root.
...

I am bad at GIT CLI. I needed to remove a couple of commits from a branch. I did it using TortoiseGit. Here are the steps. First, right click Tortoisegit in the File Explorer and open the Rebase... window:

![Image](/kiat_git/596181/attachments/...