home  bbs  files  messages ]

      ZZLI4422             linux.debian.devel             1194 messages      

[ previous | next | reply ]

[ list messages | list forums ]

  Msg # 788 of 1194 on ZZLI4422, Tuesday 8-18-25, 12:49  
  From: GUILLEM JOVER  
  To: SIMON MCVITTIE  
  Subj: Re: mixing a cherry-pick workflow with m  
 From: guillem@debian.org 
  
 Hi! 
  
 On Mon, 2025-08-18 at 09:47:03 +0100, Simon McVittie wrote: 
 > On Mon, 18 Aug 2025 at 08:57:03 +0200, Marc Haber wrote: 
 > > Additionally, is there a way to accept parts of an MR in Gitlab? 
 > 
 > Not through the web UI, but you can `git cherry-pick` as usual, and 
 > then (ask the contributor to) rebase the rest. If you have a 
 > configuration in .git/config like this: 
 > 
 > [remote "origin"] 
 >  url = https://salsa.debian.org/utopia-team/dbus.git 
 >  fetch = +refs/heads/*:refs/remotes/origin/* 
 > [remote "merge-requests"] 
 >  url = https://salsa.debian.org/utopia-team/dbus.git 
 >  fetch = +refs/merge-requests/*/head:refs/remotes/merge-requests/* 
 >  tagopt = --no-tags 
 > 
 > then the usual `git remote update` will fetch every MR for your 
 > inspection. 
  
 People might want to have these configured as different remotes if they 
 want to select when to update from each (like the above), but this can 
 also be configured as part of the same remote if one always wants all 
 of them fetched. For example I've used it like that for libbsd: 
  
   ,--- 
   [remote "fdo"] 
    url = git@gitlab.freedesktop.org:libbsd/libbsd.git 
    fetch = +refs/heads/*:refs/remotes/fdo/* 
    fetch = +refs/merge-requests/*/head:refs/remotes/fdo/mr/* 
   `--- 
  
 Regards, 
 Guillem 
  
 --- SoupGate-Win32 v1.05 
  * Origin: you cannot sedate... all the things you hate (1:229/2) 

[ list messages | list forums | previous | next | reply ]

search for:

328,129 visits
(c) 1994,  bbs@darkrealms.ca