#221 feature
Sam Minnee

Rebase and merge support

Reported by Sam Minnee | November 5th, 2009 @ 01:20 AM

It would be great if GitX had merge and rebase support. Because GitX lets me interact with git with the changeset tree always in view, I find it the natural place for performing these kind of tree manipulations.

As a suggested UI, you could right click a branch and see a couple more options:

  • "rebase <current-branch-name> to have started forking from this branch" -> call "git rebase (branchname)"
  • "merge this branch into <current-branch-name>" -> call "git merge (branchname)"

By labelling the context-menu items to explicitly state which branch you are going to rebase or merge into, it reduces the chance of people making errors. To be even more explicit, you could label them like so:

  • "rebase <current-branch-name> to have started forking from <selected-branch-name>"
  • "merge <selected-branch-anme> into <current-branch-name>"

I'm not especially happy with the description given to rebase - "rebase my-feature to have started forking from master". It's a hard feature to describe, I suppose.

In additon, you could add a context-menu to every changeset - perhaps on the little circle:

  • "rebase <current-branch-name> to have started forking from this point: "

Comments and changes to this ticket

Please Sign in or create a free account to add a new ticket.

With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.

New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

GitX is the nice-looking gitk clone for OS X

People watching this ticket