[TYPO3-dev] GIT question about diff and rebase

Peter Niederlag typo3-list at niekom.de
Wed Nov 23 12:57:36 CET 2011


Hello,

Am 23.11.2011 12:52, schrieb Stefan Geith:
[...]
> Question:
> How do I make a diff to get all _my_ _personal_ changes,
> I did, since I made my personal branch without the changes to
> the original TYPO3_4-5 branch ?

for example by:

git diff origin/TYPO3_4-5 TYPO3_4-5-sg
git diff --name-status origin/TYPO3_4-5 TYPO3_4-5-sg
git log -p origin/TYPO3_4-5..TYPO3_4-5-sg

(you can diff between *any* two SHA1's, not just symbolic refs like
tags/branches))

Greets and hth,
Peter
-- 
Peter Niederlag
http://www.niekom.de * TYPO3 & EDV Dienstleistungen *



More information about the TYPO3-dev mailing list