Hacker GitHub

← All repos

mhagger/git-imerge

View on GitHub ↗ ★ 2,850 Python

Incremental merge for git

16 mentions on Hacker News by 11 people: 5 stories, 11 comments · first 2013-07-14 · latest 2026-01-13

Mentions per year 16 mentions · busiest year 2018 (2)
20082026
AllStoriesComments NewestTopOldest
  1. …helpful for long-lived branches that aren't merged upstream. https://github.com/brooksdavis/mergify https://github.com/mhagger/git-imerge https://github.com/CTSRD-CHERI/git-mergify-rebase https://gist.github.com/nicowilliams/ea2fa2b445c2db5…
    comment by pabs3 · 2026-01-13 · in Git Rebase for the Terrified
  2. See also: https://github.com/mhagger/git-imerge
    comment by tsukikage · 2024-02-01 · in Dealing with Diverged Git Branches
  3. More options: https://github.com/CTSRD-CHERI/git-mergify-rebase https://github.com/mhagger/git-imerge/ https://github.com/brooksdavis/mergify/
    comment by pabs3 · 2023-08-13 · in Pijul: Version-Control Post-Git [video]
  4. …more implementations of the bisect-rebase idea: https://github.com/CTSRD-CHERI/git-mergify-rebase https://github.com/mhagger/git-imerge/ https://github.com/brooksdavis/mergify/
    comment by pabs3 · 2023-08-13 · in Pijul: Version-Control Post-Git [video]
  5. ▲ 1
    Git-imerge: Incremental merge for Git
    story by simonpure · 2022-07-11 · 0 comments
  6. That gist seems like a simplified version of https://github.com/mhagger/git-imerge , so check that out if you haven't. (I haven't looked at git-imerge in a long time, so I should read about it again myself.)
    comment by martinvonz · 2022-02-20 · in Jujutsu – A Git-compatible DVCS that is both simple and powerful
  7. …git-imerge for this, but there is also mergify and a faster fork of it called git-mergify-rebase. https://github.com/mhagger/git-imerge https://github.com/brooksdavis/mergify https://github.com/CTSRD-CHERI/git-mergify-rebase
    comment by pabs3 · 2021-08-13 · in On the Nature of Merge Conflicts
  8. …over the license, but I've been considering signing one just to drop the maintenance burden. https://github.com/mhagger/git-imerge https://github.com/brooksdavis/mergify https://github.com/CTSRD-CHERI/git-mergify-rebase
    comment by pabs3 · 2021-08-10 · in Official Elasticsearch Python library no longer works with open-source forks
  9. ▲ 1
    Git-imerge – incremental merge and rebase for Git
    story by pabs3 · 2020-10-08 · 0 comments
  10. https://github.com/mhagger/git-imerge > Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each…
    comment by _fbpt · 2020-01-13 · in Pijul: a distributed version control system, written in Rust (2019)
  11. ▲ 5
    git-imerge incremental merge and rebase with superpowers
    story by carlhjerpe · 2019-12-08 · 0 comments
  12. …tool while doing a messy rebase, and can't believe it has had very little discussion I can find. https://github.com/mhagger/git-imerge No previous commentary on it so far on HN: https://hn.algolia.com/?query=git%20imerge&dateRange=all So,…
    comment by peterwaller · 2018-10-18 · in Git-imerge: rebase/merge preserving history avoiding all-or-nothing
  13. I use mostly https://github.com/mhagger/git-imerge for complex merges. imerge + meld is wonderful...
    comment by bitwave · 2018-01-03 · in Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts
  14. …less overhead than communicating about pending changes. [1] https://git-scm.com/docs/git-rerere [2] https://github.com/mhagger/git-imerge
    comment by mwhite · 2016-05-04 · in Stack Overflow: How We Do Deployment
  15. ▲ 16
    Incremental merge for git
    story by petrosagg · 2014-11-24 · 0 comments
  16. ▲ 9
    Git-imerge - incremental merge and rebase for git
    story by albertzeyer · 2013-07-14 · 0 comments