On 16/11/09 burg said:

> I have two questions:
> 1) Is there a way to do git-rebase through the GIT GUI?

No idea.

> 2) Suppose I have master branch and topic branch. During my work I am
> constantly doing "git rebase -i origin/master" down to my topic
> branch. When I want to merge my Topic branch back to master, should I
> do REBASE or MERGE? Why?

Both, I would think. Rebase so your work is against the latest commit on
master, and then merge it to master to make it available.

Michael P. Soulier <msoul...@digitaltorque.ca>
"Any intelligent fool can make things bigger and more complex... It
takes a touch of genius - and a lot of courage to move in the opposite
direction." --Albert Einstein

Attachment: pgpb5l9JTbsRl.pgp
Description: PGP signature

Reply via email to