Git question: Branch with X merged into, and X has become Y (e.g. due to squash merge into master), then git rebase X --onto Y will fix that. Is there an equivalent merge? I could imagine something like git merge master --equivalent X Y
-
Prikaži ovu nit
Maybe the closest to what I want is # at rev 123 git rebase X --onto Y git reparent -p 123 Y git commit --amend -m "Merge Y" using https://github.com/MarkLodato/git-reparent … I.e. I want the same _tree_ as with git rebase, but I want it to look like a regular merge commit.
0 replies
0 proslijeđenih tweetova
1 korisnik označava da mu se sviđa
Čini se da učitavanje traje već neko vrijeme.
Twitter je možda preopterećen ili ima kratkotrajnih poteškoća u radu. Pokušajte ponovno ili potražite dodatne informacije u odjeljku Status Twittera.