Skip to main content
6 events
when toggle format what by license comment
Dec 30, 2015 at 18:07 history edited tarsius CC BY-SA 3.0
added 2 characters in body
Dec 29, 2015 at 17:01 vote accept elethan
Dec 29, 2015 at 17:00 comment added elethan My current situation is that I am a junior dev in a team of basically 2 people, and am not in a position to make any changes or even to propose changes to our current git workflow - nor, do I know enough at this point to really be able to choose between one approach or another. I was just curious if there was a quick way to go right to the merge-base of two branches through magit, since this is the way I was told to do it by team member #2 (who is basically my boss). I am trying not to be a squeaky wheel at this point :)
Dec 29, 2015 at 16:01 comment added tarsius @elethan is one of master or origin/master configured as develops upstream? If so, then it probably wouldn't be to hard to implement a generalized command to do this sort of thing (but I don't think it should be added to Magit). If develops upstream is origin/develop, then you should probably change that and instead set the push-remote to origin.
Dec 29, 2015 at 15:47 history edited tarsius CC BY-SA 3.0
added 3 characters in body
Dec 29, 2015 at 15:40 history answered tarsius CC BY-SA 3.0