Hi,

I want to check in a squashed merge commit (i.e. the result of git merge 
--squash) that had some conflicts, using the 'original' squash-merge 
message, which is in .git/SQUASH_MSG. From the manual page, i get the 
impression that i should use "git commit -t .git/SQUASH_MSG" to get that 
file (content) as template, but when i try, i still get the contents of 
.git/COMMIT_EDITMSG which summarizes the conflicts i had during the merge.

Of course, i can copy and paste the content i want myself, but i'd like to 
do it the proper way. Did i misunderstand the -t / --template commit option?

Any help would be appreciated.
Thanks

Peter

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/lRAkGkRwQi4J.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to