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

Re: [PATCH 0/6] Miscellaneous merge fixes

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 13, 2016, 01:23 UTC
Message-ID
<xmqqd1pumhdr.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1460268820-8308-1-git-send-email-newren@gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 7 quoted lines
> Elijah Newren (6):
>   Remove duplicate code
>   Avoid checking working copy when creating a virtual merge base
>   Add merge testcases for when index doesn't match HEAD
>   merge-octopus: Abort if index does not match HEAD
>   Add a testcase demonstrating a bug with trivial merges
>   builtin/merge.c: Fix a bug with trivial merges

Please be careful when giving titles to your patches. They will be shown in a context that is much wider than the area your attention is currently concentrated on. E.g. does "Remove duplicate code" tell readers of "git shortlog --no-merges v2.8.0..v2.9.0" what the change was about when it eventually appears in the upcoming release?

Show 8 quoted lines
>
>  builtin/merge.c                          |   8 ++
>  git-merge-octopus.sh                     |   6 ++
>  merge-recursive.c                        |   8 +-
>  t/t6044-merge-unrelated-index-changes.sh | 153 +++++++++++++++++++++++++++++++
>  t/t7605-merge-resolve.sh                 |   6 +-
>  5 files changed, 175 insertions(+), 6 deletions(-)
>  create mode 100755 t/t6044-merge-unrelated-index-changes.sh
Previous: Elijah NewrenNext: Elijah Newren
Message 9 of 10 in “Miscellaneous merge fixes”
  1. 0/6 Miscellaneous merge fixesElijah Newren, Apr 10, 2016
  2. 1/6 Remove duplicate codeElijah Newren, Apr 10, 2016
  3. 2/6 Avoid checking working copy when creating a virtual merge baseElijah Newren, Apr 10, 2016
  4. Junio C HamanoApr 13, 2016
  5. 3/6 Add merge testcases for when index doesn't match HEADElijah Newren, Apr 10, 2016
  6. 4/6 merge-octopus: Abort if index does not match HEADElijah Newren, Apr 10, 2016
  7. 5/6 Add a testcase demonstrating a bug with trivial mergesElijah Newren, Apr 10, 2016
  8. 6/6 builtin/merge.c: Fix a bug with trivial mergesElijah Newren, Apr 10, 2016
  9. Junio C HamanoApr 13, 2016
  10. Elijah NewrenApr 15, 2016

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.