#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

  • Miocic vs Cormier

    Miocic vs Cormier July 1st, 2020 @ 07:35 AM

    UFC 252: Miocic vs Cormier 3 is an upcoming mixed martial arts event produced by the Ultimate Fighting Championship that will take place on August 15, 2020 at the UFC APEX facility in Las Vegas, Nevada, United States.

  • Infigic Technologies

    Infigic Technologies July 2nd, 2020 @ 05:37 PM

    Magento being a feature-rich platform, only an expert Magento 2eCommerce developer can build you a solution that’s huge yet user-friendly, massive yet tamper-proof, simple yet forward-looking. It’s versatility can build eCommerce websites that are easy to scale as your business grows. A highly-rated Magento development company like Infigic can help you to build a Magento eCommerce store that your customers will love. For more info do visit us at :-https://www.infigic.com/magento-ecommerce-development/

  • Alva Marlin

    Alva Marlin July 11th, 2020 @ 10:19 AM

    The annual rite of alleyway all summer tends to focus around those circle-the-date-games regarding the directory. Those are the games that disquiet the nonconference schedule, the conference races and in, November, the College Football Playoff. The leagues decision could be influential for add-on academic circles presidents as they find how to handle the coronavirus pandemic. It is the first Division I conference to defer football for the slip. College Football Live Reddit The leagues council of presidents made that trailer Wednesday afternoon in news that was first reported by CBS Sports Jon Rothstein, as the world deals back the COVID-19 pandemic. Rothstein reported the league will not achievement any sports back Jan. 1, 2021.

  • Robison

    Robison July 11th, 2020 @ 01:49 PM

    It is an application website where you can also join them by getting your registration done. Lightroom has their active receptors for the new upcoming forums for the solution. You can follow pillarwm to gain more helpful info about the wealth. You can also get the latest updates from them. Join it for more.

  • customtravlss

    customtravlss July 11th, 2020 @ 06:29 PM

    The purchaser should pay the rebate to the dealer over what they got from the properties to balance publicizing, faculty the board, and web rankings.Travel club In this way, while you'll eat up some reasonable arrangements through these markdown travel specialists, decisions are normally restricted and you keep on don't get the catch you'll be longing for.

  • Thurs1933

    Thurs1933 August 8th, 2020 @ 12:05 PM

    You must follow https://techy-brand.com/ to gain more in marketing.

  • allsportcov19

    allsportcov19 August 11th, 2020 @ 04:12 PM

    L’équipe Ineos change de nom du Tour de France 2020 pour promouvoir le nouveau 4 × 4 de son sponsor. Tour de France 2020 En Direct Live
    L’équipe britannique WorldTour a déposé une demande auprès de l’UCI pour demander le changement de nom des Ineos Grenadiers et changer de kit d’équipe alors qu’ils cherchent à promouvoir le Ineos Grenadier, qui a été lancé plus tôt ce mois-ci.

  • allsportcov19

    allsportcov19 August 11th, 2020 @ 05:18 PM

    Om de release van het in Wales gebouwde voertuig te promoten, wordt van Team Ineos verwacht dat ze hun naam veranderen in de Ineos Grenadiers uit de Ronde van Frankrijk en hun uitrusting veranderen van rood in blauw. Ronde van Frankrijk 2020 Live Kijken
    Het is bekend dat teams tijdens grote rondes hun naam en tenue hebben veranderd om de sponsors tevreden te houden – in 2018 veranderde Lotto-Soudal hun naam in Lotto Fix All tijdens de Giro d’Italia om een ​​kleefstof in Italië te promoten, waardoor de kleur van hun kit die past bij de branding van het product.

  • vopawo

    vopawo August 19th, 2020 @ 12:58 PM

    This was all about Derry v Longford Football Match. Here you will get information about Dates and Venue, Tickets, and Live Streaming information. By using this information you can easily get access to streaming gaa outside ireland Stream. We will share more information like that. For more information keep visiting here.

  • vopawo

    vopawo August 19th, 2020 @ 01:45 PM

    TG4 unveiled the station’s 2020 GAA coverage today with details of their comprehensive schedule of GAA coverage for the coming months. TG4 will broadcast or stream 52 GAA matches between now and the beginning of April starting with live coverage. The AIB live GAA Football Championship streaming 4th January. GAA BEO will continue to be the home of live and exclusive coverage of all the major finals. Including the Allianz Football League Finals, Allianz Hurling League Final. AIB All Ireland Club Finals, Electric Ireland Sigerson, Fitzgibbon and Second Level Finals.

  • heraxiw
  • Davison1

    Davison1 September 19th, 2020 @ 07:13 AM

    Lighthouse is the website which has an essential forum that includes their special project which you can get it for your help. Now you can check myassignmenthelp review and get to learn more new ways about the education. They are offering you to add your project information for further details. Join their website for registration.

  • Brugge De Panne 2020 Live

    Brugge De Panne 2020 Live September 23rd, 2020 @ 01:38 PM

    Met behulp van de steeds verder gaande ontwikkelingen is het heel gemakkelijk geworden om Brugge-De Panne 2020 te erkennen voor eventuele contracepties. Fans kunnen Brugge De Panne 2020 Live Kijken online bekijken op hun Ipad, Mac, pc, pc of een ander Android-apparaat. Ze kunnen de onderzoeken bekijken en bekijken op elk punt, elke plaats, overal op de planeet. Op deze manier kunt u genieten van uw favoriete Brugge-De Panne 2020 Live Stream Online. We waren van plan om de meest geavanceerde kenmerken van live Gushing-organisaties tegen de beste kosten aan te bieden. Fans moeten gewoon een beetje gemiddelde waarde betalen voor de Brugge-De Panne 2020 Event-ups live spuitoefeningen. Het beste deel is dat je toegang krijgt voor Brugge-De Panne 2020, dus je zult je favoriete bijeenkomst of competitie het hele evenement volgen en volgen.

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