Code Monkey home page Code Monkey logo

Comments (4)

jesseduffield avatar jesseduffield commented on April 28, 2024 4

this has actually been completed a while ago: you can hit 'f' on branch to fast-forward it to match its upstream ,and then 'r' to rebase onto it or 'M' to merge with it

from lazygit.

jesseduffield avatar jesseduffield commented on April 28, 2024

Yeah that sounds like a good idea. Maybe a keybinding like 'f' to fetch from remote on the selected branch. Only caveat I can think of is: if you're trying to merge develop into master, what happens if your local develop has diverged from your remote develop? Is this a command that has error cases?

from lazygit.

jonnermut avatar jonnermut commented on April 28, 2024

Yeah I guess it will error if you have non pushed commits, but thats fine assuming you have the capability to show an error. Or even ignore.
Do you show behind/infront numbers for the branches (I can't see any on my local working copy at the moment?)
Eg in sourcetree:
image

from lazygit.

jonnermut avatar jonnermut commented on April 28, 2024

Oh I just noticed it for the current branch, top left

from lazygit.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.