Elijah Newren <new...@gmail.com> writes: > 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? > > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
