On 6/10/20 11:38 AM, Nathan Sidwell wrote:
I'm trying to merge master to devel/c++-modules, as I usually do. But
there's an ICE creeping in, so I'm attempting incremental merges to
figure out what happened.
I thought 'git merge --no-commit origin $HASH' would do that, pulling
$HASH out of master's commit history (git tree --first-parent). But
this doesn;t seem to be working. In particular I thought that if $HASH
matched the last master commit that I merged from, the result would be a
nop. It isn't :(
How do I update my branch to some non-HEAD point on master?
Answering my own question, I should say 'git merge --no-commit $HASH'
(omitting the 'origin'). When merging from a branch head, I found I
needed 'origin' -- eg 'git merge origin master'
nathan
--
Nathan Sidwell
