git merging branches in a bare repository

by

Note, this can actually be done on a bare repo, but you have to work around the normal interface.

$ git read-tree -i -m branch1 branch2
$ COMMIT=$(git commit-tree $(git write-tree) -p branch1 -p branch2 < commit message)
$ git update-ref mergedbranch $COMMIT

Update: since git 2.38, “git merge-tree” has a new mode to do this, using the same machinery as “git merge”. From the usage section of the manpage:

NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2)
test $? -eq 0 || die "There were conflicts..."
NEWCOMMIT=$(git commit-tree $NEWTREE -p $BRANCH1 -p $BRANCH2)
git update-ref $BRANCH1 $NEWCOMMIT

More Related Contents:

  1. How to merge a specific commit in Git
  2. How to import existing Git repository into another?
  3. Git cherry pick and datamodel integrity
  4. What’s the difference between ‘git merge’ and ‘git rebase’?
  5. How can I prevent foxtrot merges in my ‘master’ branch?
  6. Updates were rejected because the remote contains work that you do not have locally
  7. How to convert a normal Git repository to a bare one?
  8. `git merge -s theirs` needed but it does not exist
  9. Git Cherry-pick vs Merge Workflow
  10. What is a bare repository and why would I need one?
  11. Trying To Understand/Determine A Basic Git Workflow
  12. git rebase and git push: non-fast forward, why use?
  13. git merge: Removing files I want to keep!
  14. Making Git retain different section content between branches
  15. Git: Merge to master while automatically choosing to overwrite master files with branch
  16. Git submodule on remote bare
  17. How to “git show” the diffs for a merge commit?
  18. Git: merging public and private branches while while keeping certain files intact in both branches
  19. How would I write a pre-merge hook in Git?
  20. How do I convert a bare git repository into a normal one (in-place)?
  21. Are there any downsides to enabling git rerere?
  22. Error “Updates were rejected because the remote contains work that you do not have locally”
  23. What to do with branch after merge
  24. “fetch –all” in a git bare repository doesn’t synchronize local branches to the remote ones
  25. Git: How to create patches for a merge?
  26. git: How do I add a custom merge strategy?
  27. Git: Merge a Commit into a different Branch
  28. Git merge squash repeatedly
  29. How to perform a three-way diff in Git without merging?
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment