- Set your name with git
git config --global user.name "Ivan Ivanov" git config --global user.email "firstname.lastname@example.org"
- Clone the repository
git clone email@example.com:MariaDB/server.git cd server
git branchto check that you're working on MariaDB 10.1:
server $ git branch * 10.1
- Config repository pull and alias for fast forward:
git config pull.ff only git config --global alias.ff "merge --ff-only"
In git commit messages are normally formatted as
subject body more body ...
That is, the first line is considered a *subject*, much like email subject. Many git commands and pages on github only show the commit subject, not the complete comment. After the subject goes an empty line, then the detailed description of the comment. Please, structure your commit comments this way, don't forget the empty line.
This is an important concept, and git branches do not have equivalents in bzr.
In Bazaar, we all used to have one shared repository, within which there were many branches. This seems to be impossible with git?
In Git, each repository has only one branch that is currently checked out.
List existing branches
To see which branches exists locally and remotely:
git branch --all
To move to work on a specific branch
git checkout branch-name
Note that if the output from
git branch --all is
remotes/origin/XXX you should just use
XXX as branch name.
Making a local copy of a branch (like bzr clone)
branch clone old_directory new_directory cd new_directory git remote set-url origin firstname.lastname@example.org:MariaDB/server.git git pull
Remove last commit from a branch
git reset --hard HEAD^
Fetch a branch someone has done a rebase on
If you get the following error on pull:
shell> git pull X11 forwarding request failed on channel 0 fatal: Not possible to fast-forward, aborting.
Instead of removing your copy and then clone, you can do:
git reset --hard origin/##branch-name##
Other things about branches
- Note: branches whose names start with
bb-are automatically put into the buildbot.
Equivalents for some bzr commands
CAVEAT UTILITOR. Check the manual before running!
git reset --hard
bzr revert filenameis
git checkout filename
git remote -v(but there are more detailed commands)
bzr parent to-default-mariadb-repogit remote set-url origin email@example.com:MariaDB/server.git
git push REMOTENAME BRANCHNAME. REMOTENAME is typically "origin", for example:
git push origin 10.1-new-feature
bzr clean-tree --ignoredis
git clean -Xdf(note the capital X!)
git rev-parse --show-toplevel
bzr missing --mine-onlyis
git cherry -v origin(kind-of).
git gui blame
In the MariaDB project, it is a good idea (and a long tradition since MySQL Ab) to have all your commits sent to a firstname.lastname@example.org mailing list. It allows others to follow the progress, comment, etc.
A script and instructions on how to setup commit triggers in Git are here: http://bazaar.launchpad.net/~maria-captains/mariadb-tools/trunk/files/head:/git_template/ . Jira task for commit trigger was MDEV-6278.
Attributing code to someone else
If you add code on behalf of someone else, please attribute the code to the original author:
git citooland move changed files to staged.
commit, abort instead
git commit --author="Original author name <email_address>"
The above is needed as
git citool can't handle the
Diff for last commit
Applying new code from main tree to a branch
You are working on a branch (
NEW_FEATURE) and would like to have into that branch all changes from the main branch (
git checkout 10.1 git pull git checkout NEW_FEATURE git rebase 10.1
Applying a bugfix in the main branch
You've just fixed and committed a bug in the main 10.1 branch and want to merge it with the latest 10.1. Often a rebase is better in this case. Assuming your current checked out branch is 10.1:
git fetch origin git rebase origin/10.1
This will work even if you have done multiple commits in your local 10.1 tree.
Dealing with conflicts when one tries to push
What to do when you have fixed a bug in the main tree but notices that someone has changed the tree since you pulled last time. This approach ensures that your patch is done in one block and not spread out over several change sets.
git clone 10.1 cd 10.1 < fix a bug here> git citool git push # ^ and the above fails, because someone has pushed to 10.1 in between git branch tmp # ^ copy our work to branch named 'tmp' get checkout 10.1 git reset --hard HEAD^ # ^ remove our work from '10.1' local branch' git pull # ^ get changes from remote git checkout tmp git rebase 10.1 # ^ switch to 'tmp' and try to rebase 'tmp' branch on top of 10.1 branch. # here you will be asked to merge if necessary git checkout 10.1 git pull --ff . tmp # ^ switch back to the '10.1' branch, and pull from 'tmp' branch. git branch -D tmp #^ this removes the tmp. branch git push