The Ultimate Guide to High Availability with MariaDB

Using Git

You are viewing an old version of this article. View the current version here.

Setup

  • Set your name with git 
git config --global user.name "Ivan Ivanov"
git config --global user.email "[email protected]"
  • Clone the repository 
git clone [email protected]:MariaDB/server.git
cd server
  • Run git branch to check that you're working on MariaDB 10.1: 
server $ git branch
* 10.1

Commit comments

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.

Branches

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. 

git branch

Note: branches whose names start with bb- are automatically put into the buildbot.

Equivalents for some bzr commands

CAVEAT EMPTOR. Check the manual before running!

  • bzr status is git status
  • bzr diff is git diff
  • bzr log is git log
  • bzr revert is git reset --hard
  • bzr parent is git remote -v (but there are more detailed commands)
  • bzr push is git push REMOTENAME BRANCHNAME. REMOTENAME is typically "origin", for example: git push origin 10.1-new-feature
  • bzr clean-tree --ignored is git clean -Xdf (note the capital X!)
  • bzr root is git rev-parse --show-toplevel
  • bzr missing --mine-only is git cherry -v origin (kind-of).

GUIs

  • bzr gcommit is git citool
  • bzr viz is gitk
  • bzr gannotate is git gui blame

See also

Comments

Comments loading...
Content reproduced on this site is the property of its respective owners, and this content is not reviewed in advance by MariaDB. The views, information and opinions expressed by this content do not necessarily represent those of MariaDB or any other party.