git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Weird merge records

From
DSDan Stromberg <strombrg@gmail.com>
Date
Apr 28, 2023, 15:34 UTC
Message-ID
<CAOvKW55oWs+atYyy-cTb=H0VhJx-V+M7_7FsqjdJ_jU9bR+8LA@mail.gmail.com>
Hi.

I'm in a development team that has one official repo, and each developer has their own repo that is much the same as that official repo - modulo how recently we synchronized them.

I'm getting _many_ Merge records that look like:
    Merge branch 'develop' of ghosthub.whatever.net:abcd-def/ghij-jk…
...and I don't know where they are coming from.

The merge records do not appear to show up in 'git log -v'. I only see them in Ghosthub pull requests (Ghosthub being like Github, but private).

I suspect the merge records may be coming from this small bit of shell
script I've been using to pull from the master repo into my personal
repo:
    git fetch upstream
    git checkout "$branch"
    git config pull.rebase false
    git pull upstream "$branch"
    git push origin "$branch"

Does that snippet look responsible? If yes, how might I change it to stop creating all those merge records? If no, any guesses what else might be causing it?

Thanks!
Next: Thomas Guyot
Message 1 of 8 in “Weird merge records”
  1. Dan StrombergApr 28, 2023
  2. Thomas GuyotMay 6, 2023
  3. Felipe ContrerasMay 7, 2023
  4. Dan StrombergMay 8, 2023
  5. Felipe ContrerasMay 8, 2023
  6. Dan StrombergMay 8, 2023
  7. Felipe ContrerasMay 8, 2023
  8. Dan StrombergMay 8, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.