All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sven Strickroth <sven@cs-ware.de>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: Commit message not helpful after merge squash with conflicts
Date: Sat, 5 Mar 2016 11:38:22 +0100	[thread overview]
Message-ID: <56DAB71E.6000509@cs-ware.de> (raw)

Hi,

after a "git merge --squash" with a conflict the commit message is not
helpful as it only includes the conflicted files information, however, I
expect to see the content of SQUASH_MSG which contains the summary of
the merged commits. SQUASH_MSG seems to be just ignored.

I think git should either read SQUASH_MSG and append COMMIT_MSG or add
the conflict information into SQUASH_MSG and create no COMMIT_MSG.

References:
 *
https://stackoverflow.com/questions/3605385/merge-conflicts-ruin-my-commit-message-while-squashing-commits
 * https://gitlab.com/tortoisegit/tortoisegit/issues/1902

-- 
Best regards,
 Sven Strickroth
 PGP key id F5A9D4C4 @ any key-server

             reply	other threads:[~2016-03-05 10:46 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-05 10:38 Sven Strickroth [this message]
2016-03-08  4:17 ` [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred Sven Strickroth
2016-03-08 18:32   ` Junio C Hamano
2016-03-08 18:49     ` Sven Strickroth
2016-03-08 18:51       ` Junio C Hamano
2016-03-08 19:03     ` [PATCH] commit: do not lose SQUASH_MSG contents Sven Strickroth
2016-03-09 18:04     ` [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred Junio C Hamano
2016-03-09 20:24       ` Junio C Hamano
2016-03-13 18:39         ` [PATCH] commit: do not lose SQUASH_MSG contents Sven Strickroth
2016-03-14 18:19           ` Junio C Hamano
2016-03-14 20:19             ` Junio C Hamano
2016-03-21 22:29               ` Sven Strickroth
2016-03-21 22:34                 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56DAB71E.6000509@cs-ware.de \
    --to=sven@cs-ware.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.