Reading this part of the #git book https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History on #rebase again because I haven't used git at work for a while and my personal projects rarely require much sophistication.

I like this pattern:
```
git log -$n
git rebase -i HEAD~$n
```
Where `$n` is the number of commits back to go. It lets you double-check how far back you want to start rebasing.
#til

One of my biggest gripes with #codereview was the constant need to #rebase when another MR is merged.

On a high frequency project, and/or a project with long-running pipelines, this can lead to quite the impact on productivity.

Today I implemented a script into a #gitlab pipeline that automatically rebases open/non-draft MRs on merge.

#code #review #git #merge

Tell me you don't know how to #rebase without telling me.

squash+merge no Git: https://gmgall.net/blog/squash+merge-no-git/

#blog #blogging #git #scm #squash #merge #rebase

Lien vers la vidéo « Savez-vous vraiment comment fonctionne #git ? » DEVOXX FR ajouté.

Bonne vidéo, didactique, présentation claire.

https://happynumeric.fr/mediawiki/index.php/Git

#commit #tree #hash #merge #rebase #pull #fetch #push #garbagecollection

🙏🌞

🤔 Is crawl into a ball under my desk and cry an option?

#git #rebase #merge #Umm

I've some decent skills using #git.

However, some days, I can find myself in a long, absurd series of tech pratfalls where all my attempts become increasingly more comedic.

The series normally starts with "Oh, I'll just #rebase that real quick"

NFT app Rebase co-founder accused of going ‘rogue’ in suit by partner - An apparent business partner of Rebase's co-founder claims he was... - https://cointelegraph.com/news/nft-app-rebase-co-founder-accused-of-going-rogue-in-suit-by-partner #trademarkinfringement #u.s.districtcourt #krzysztofgagacki #breachofcontract #businesspartners #edmondtruong #partnership #defamation #co-founder #dispute #rebase

https://dev.to/jenc/git-rebase-for-preventing-merge-commits-2len - a bunch of methods to #git #rebase to prevent #merge commits fi you light straighter history. Nice article with deep analysis of each method @jenc.

Had some fun figuring out #git #rebase today. The outcome was: Don't pull a (semi-)public branch 'origin/feature', which diverged from its local branch 'feature' after its parent branch 'develop' has been rebased onto it, if you don't want seeing a fork after merging 'feature' back into 'develop'.
Yes, it only sounds half complicated like it behaves in real life.
:parrot_dad:

So today I realised that I forgot to add the global setting to make me automatically sign my git commits:

git config --global commit.gpgsign true

(Just setting up your user.signingkey isn’t enough.)

Also, you can go rebase your whole history to sign all your commits using:

git rebase --signoff --root

(However, you’ll end up with a linear history and lose any branch/merge history, etc.)

#git #commit #gpg #signatures #signedCommits #rebase #signoff

Alright, the first impression is that @sapling and I are going to get along just fine. Why? It’s as opinionated as I am in regards to workflows and #rebase friendly so I can see myself use this to interact with #git repositories as it feels very natural.

Also building a #sapling segment for #ohmyposh 🫣

Lots of engineers at Workday were rebasing. When I showed them how to properly keep their main branch up to date, #merge from upstream main, they never went back to #rebase. In a monorepo with lots of package.json changes rebase was hell.

always fun to investigate a weird merge by doing the same #git #rebase your teammate did and get a wildly divergent result. good times, good times.

Resolving conflicts during a Git rebase #git #rebase - https://codeinthehole.com/guides/resolving-conflicts-during-a-git-rebase/

How do you merge a PR on GitHub? 🤨

I mean, ok, you hit the green button at the bottom of the page... but do you have a strategy?

GitHub lets you merge a PR in three different ways: merge commit, squash and rebase.

Cool! Isn't merge commit just fine? Well... you're probably missing out of some extra benefits from squash or rebase, depending on your project and team practices.

Here's an interesting overview: https://youtu.be/rFRtsiQEJZw

#github #pullrequest #squash #rebase

How do you merge a PR on GitHub? 🤨

I mean, ok, you hit the green button at the bottom of the page... but do you have a strategy?

GitHub lets you merge a PR in three different ways: merge commit, squash and rebase.

Cool! Isn't merge commit just fine? Well... you're probably missing out of some extra benefits from squash or rebase, depending on your project and team practices.

Here's an interesting overview: https://youtu.be/rFRtsiQEJZw

#github #pullrequest #squash #rebase

@christosilvia that can be tricky and frustrating. You could consider doing merge via a script or alias. Where you do a `git pull --rebase` before running a merge, so you can handle the conflict as part of the #rebase. This is where tools are super helpful. I use #magit (#git client for #emacs) and find it very helpful. Hopefully the tags attract some more helpful suggestions.
@arth

Just found a nearly complete article I wrote on rebasing.. should I finish it? Does anyone still rebase?! #webdev #webdevelopment #rebase #git

Le vendredi matin, git push origin {branch} --fonce devrait être une syntaxe valide pour push --force #git #rebase