mhagger/git-imerge

Issues

• Request: Add --update-refs option to git-imerge

  #213 opened 4 months ago by ramcdona
  0

• Empty commits after rebase

  #212 opened 4 months ago by abitrolly
  1

• Undocumented requirement: setuptools

  #210 opened 6 months ago by dabrahams
  0

• [Request] Keep diff3 conflictstyle as clear as without imerge

  #197 opened 2 years ago by tuxayo
  3

• Question: can git-imerge product a list of all conflicts in advance and their associated commits?

  #209 opened a year ago by hpe-ykoehler
  1

• add support for new Python `pyproject.toml` standard: `setup.py install` is deprecated

  #208 opened a year ago by pabs3
  0

• possibility of merging unrelated histories

  #203 opened 2 years ago by Avinash-Bhat
  0

• backtracking repeats unrelated autofills

  #202 opened 2 years ago by jrosenberger
  0

• Stuck in a merge, imerge crashes when attempting to continue

  #199 opened 2 years ago by vmsh0
  2

• git-imerge rebase does not sign commits despite `gpgsign = true` in `.git/config`

  #140 opened 6 years ago by mgudemann
  3

• Automate ability to extend merge when source branches are updated

  #198 opened 2 years ago by jrosenberger
  3

• How to manually cleanup in case of a crash?

  #196 opened 2 years ago by tuxayo
  4

• non-zero exit status 128

  #187 opened 3 years ago by jeacott1
  2

• [Question] why is such a feature not integrated in git main?

  #191 opened 3 years ago by LowLevelMahn
  1

• Cannot proceed dead lock ( maybe related to `git lfs` in history? )

  #190 opened 3 years ago by flybyray
  2

• add a stop, abort, or similar command

  #189 opened 3 years ago by jacob-keller
  5

• Add automated tests

  #128 opened 3 years ago by pradyunsg
  3

• imerge sometimes reports a conflict, leaving unmerged files with zero conflicts

  #161 opened 4 years ago by dabrahams
  10

• Is it possible to redo parts of an iterative merge?

  #188 opened 3 years ago by BowiFromStackOverflow
  4

• Exact equivalent of `git rebase --onto ancient origin/ancient modern` ?

  #183 opened 4 years ago by rulatir
  2

• Merging a branch that has merge commits

  #186 opened 4 years ago by OliverJAsh
  1

• Why autofills if automerge succeeds?

  #185 opened 4 years ago by egpbos
  2

• Error: untracked working tree files aborts imerge

  #184 opened 4 years ago by egpbos
  6

• Equivalent of the most general case git rebase --onto COMMIT1 COMMIT2 COMMIT3?

  #146 opened 5 years ago by rulatir
  5

• Cannot install if the pkg-config call fails

  #153 opened 4 years ago by kergoth
  5

• Identifying list of conflicting commits

  #177 opened 4 years ago by ericcurtin
  1

• Install fails on zsh

  #158 opened 4 years ago by c-alpha
  4

• Allow "python setup.py install --user"

  #159 opened 4 years ago by thehans
  1

• Skip incompatible merges

  #171 opened 4 years ago by NZJenkins
  1

• New Release

  #160 opened 4 years ago by blitz
  1

• Interactive Rebase With History Preserving Past Merges

  #170 opened 4 years ago by RandomDSdevel
  1

• Please document my options w.r.t. merge resolution

  #162 opened 4 years ago by dabrahams
  1

• Make it easy to amend a completed imerge

  #163 opened 4 years ago by dabrahams
  1

• Option to keep original commit message in goal=rebase-with-history

  #164 opened 4 years ago by ravirajkarasulli
  1

• What do the numbers mean during rebase?

  #155 opened 4 years ago by abitrolly
  2

• port to Python 3

  #148 opened 4 years ago by pabs3
  5

• Shell completion for HEAD ref ignores tags

  #147 opened 5 years ago by jasonkarns
  1

• --goal='rebase' is not yet supported for branches that include merges.

  #151 opened 4 years ago by abitrolly
  3

• Add a --transposed option to the diagram subcommand

  #145 opened 5 years ago by waldyrious
  4

• autofilling not optimal?

  #149 opened 4 years ago by skok-gpfw
  2

• Honor rebase.autostash config

  #144 opened 5 years ago by pointlessone
  0

• How do I switch to a different imerge?

  #142 opened 6 years ago by skestle
  4

• git-imerge continue fails with "Commit <SHA> is not usable; it is an octopus merge" when log.showSignature is set in config

  #141 opened 6 years ago by cscutcher
  2

• bash-completion doesn't seem to work with "git-imerge"

  #139 opened 6 years ago by hasufell
  2

• Original author not preserved for rebased commits

  #135 opened 6 years ago by DEVoytas
  6

• "goal" of imerge not reported accurately

  #136 opened 6 years ago by DEVoytas
  0

• Generate Rebase-with-history Result based on Full Result

  #129 opened 6 years ago by make1980-zz
  8

• Parallel Execution of Full IMerge

  #131 opened 6 years ago by make1980-zz
  1

• Is it possible/desirable for imerge to ignore merge commits as potential "original commits" to a conflict?

  #127 opened 7 years ago by benjaminpetrin-zz
  1

• Problems with umlauts on finish?

  #125 opened 8 years ago by dueringa
  7