modgit: Deploy multiple Git repositories in a unique folder
Related cards:
A Simple Git Workflow based on A successful Git branching model
I use TortoiseGit, with default options, ie, merge with ff.
Applicable for hot-fixes and small features.
Branch Naming
Prefix the branch name with the issue# then follow by a short subject, eg, 757_duplicate_order
Commit Message
Start...
How to deploy the code to shared host with git
Push Git Repo Into Shared Hosting Account Like Hostgator
What's required is that git client is install in the host.
How to Update a Forked Repository from Upstream
Scenario
2 to 3 remote repositories in GitHub and 2 local repositories:
- [GitHub] Go to an owner repository (eg OpenMage).
- [GitHub] Fork owner's repository (from item 1).
- [GitHub or BitBucket] Our application with custom code.
- [Loca...
How to migrate to Magento LTS with git with combined histories
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...
How to work with git in an evironment with production, staging, dev servers
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...
How to check compare changes on a topic branch to master
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...
TortoiseGit Makes Git Easy
Instructions
- Install TortoiseGit
- Install Git For Windows
Using SSH with TortoiseGit
ref: https://confluence.atlassian.com/display/BITBUCKET/Set+up+SSH+for+Git
- Follow the guide from STEP 1 to STE...
fatal: Authentication failed for 'https://emgs@bitbucket/emgstars/stars.git/'
Description
When using TortoiseGit to push a commit, there is an error:
git did not exit cleanly (exit code 128)
Using the console to push:
git push -u bitstars masters
and after entering the password, there is an er...
How to remove commits from a branch
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/...
Merge a GitHub Pull Request to Local Repo
When we need to test a PR in github or we want to incorporate a PR, we can checkout the PR locally.
To check out a pull request locally, use the gh pr checkout subcommand. Replace pull-request with the number, URL, or head branch of the pull requ...