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

Re: [PATCH] git-revert with conflicts to behave as git-merge with conflicts

From
Junio C Hamano <junkio@cox.net>
Date
Oct 12, 2006, 22:27 UTC
Message-ID
<7vejtdkw4t.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20061012215242.16419.qmail@web31810.mail.mud.yahoo.com>
Luben Tuikov <ltuikov@yahoo.com> writes:
Show 11 quoted lines
> --- a/git-commit.sh
> +++ b/git-commit.sh
> @@ -441,7 +441,7 @@ then
>  elif test "$use_commit" != ""
>  then
>  	git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
> -elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
> +elif test -f "$GIT_DIR/MERGE_MSG"
>  then
>  	cat "$GIT_DIR/MERGE_MSG"
>  elif test -f "$GIT_DIR/SQUASH_MSG"

If you rely on MERGE_MSG then you would need to clean it after commit is done. Currently it does not and checks MERGE_HEAD, and cleans up MERGE_HEAD when it is done. MERGE_MSG is not cleaned.

Previous: Luben TuikovNext: Luben Tuikov
Message 2 of 5 in “git-revert with conflicts to behave as git-merge with conflicts”
  1. git-revert with conflicts to behave as git-merge with conflictsLuben Tuikov, Oct 12, 2006
  2. Junio C HamanoOct 12, 2006
  3. Luben TuikovOct 12, 2006
  4. Junio C HamanoOct 13, 2006
  5. Luben TuikovOct 13, 2006

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.