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

FEATURE REQUEST: Announce branch name with merge comamnd

From
Jari Aalto <jari.aalto@cante.net>
Date
Dec 11, 2009, 18:55 UTC
Message-ID
<87zl5p1gsp.fsf@jondo.cante.net>
Doing octopus merge results:
    $ git merge ...
    Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d
    Trying simple merge with b650c8c8809ef493ad4128fc941ed6b520c82f28
    Trying simple merge with 047f83d6c8a08c4016004780e94257d9e487b7e6
    Simple merge did not work, trying automatic merge.
    Auto-merging example.jwmrc
    Trying simple merge with 16860b016e198acd0814492092e2ad5ea88fb219
    Simple merge did not work, trying automatic merge.
    Auto-merging example.jwmrc
    Trying simple merge with 9a397ff24a381ce49dd093c4f51c06c4c62f3ce7
    Simple merge did not work, trying automatic merge.
    ...
SUGGESTION

Please announce the branch name being merged so that the listing is easier to follow (possibly only with --verbose, -v option). Add "Branch: <name>" just before the merge is attempted. somethiglike this

    Branch: bug--manpage-fix-hyphen
    Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d
    Branch: bug--manpage-fix-TH
    Trying simple merge with b650c8c8809ef493ad4128fc941ed6b520c82f28
    Branch: bug-manpage-change-binary-name
    Trying simple merge with 047f83d6c8a08c4016004780e94257d9e487b7e6
    Branch: feature--example.jwmrc-change-browser
    Simple merge did not work, trying automatic merge.
    Auto-merging example.jwmrc
    Branch: feature--example.jwmrc-change-clock
    Trying simple merge with 16860b016e198acd0814492092e2ad5ea88fb219
    Simple merge did not work, trying automatic merge.
    Auto-merging example.jwmrc
    Branch: feature--example.jwmrc-change-font
    Trying simple merge with 9a397ff24a381ce49dd093c4f51c06c4c62f3ce7
    Simple merge did not work, trying automatic merge.
    ...
Next: Junio C Hamano
Message 1 of 14 in “FEATURE REQUEST: Announce branch name with merge comamnd”
  1. Jari AaltoDec 11, 2009
  2. Junio C HamanoDec 11, 2009
  3. 1/3 octopus: make merge process simpler to followStephen Boyd, Dec 12, 2009
  4. Junio C HamanoDec 12, 2009
  5. Johannes SixtDec 12, 2009
  6. Junio C HamanoDec 12, 2009
  7. octopus: make merge process simpler to followStephen Boyd, Dec 15, 2009
  8. Junio C HamanoDec 15, 2009
  9. Stephen BoydDec 15, 2009
  10. 2/3 octopus: reenable fast-forward mergesStephen Boyd, Dec 12, 2009
  11. 3/3 octopus: remove dead codeStephen Boyd, Dec 12, 2009
  12. Junio C HamanoDec 12, 2009
  13. Alex RiesenDec 12, 2009
  14. Jari AaltoDec 12, 2009

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.