[TYPO3-dev] [GIT] How to merge branches

[Peter Niederlag]

Hello,

Am 17.11.2011 09:24, schrieb Steffen Gebert:
[...]
> git diff master bemodule ?

Shows content diff (could be saved and reapplied somehwere else)

> You can check that be typing `git log master bemodule` first.

git log onebranch..otherbranch

(note the two dots in between!)
show commits that are on otherbranch but missing in onebranch.
This is mostly useful before running git merge.
git log xyz foobar IMO is mostly not useful and just will show both
branches logs

> Syntax is `git whatever in-this-branch but-not-in-this-branch`

hmm. ;)

Greets,
Peter

P.S.: we will try to update gerrit sometime beginning next year.
-- 
Peter Niederlag
http://www.niekom.de * TYPO3 & EDV Dienstleistungen *