SZEDER GÃbor <szeder@xxxxxxxxxx> writes:
> On Thu, Dec 16, 2010 at 11:38:21PM -0800, Junio C Hamano wrote:
>> * pd/bash-4-completion (2010-12-15) 3 commits
>> - Merge branch 'master' (early part) into pd/bash-4-completion
>> - bash: simple reimplementation of _get_comp_words_by_ref
>> - bash: get --pretty=m<tab> completion to work with bash v4
>>
>> Updated by Jonathan; this still has some conflicts around "notes"
>> completion I tried to resolve near the tip of 'pu'.
>
> The resolution of that conflict is not quite correct. I'm not sure
> how I should send a proper conflict resolution... but I'll try
> anyway.
Thanks, this helped me quite a lot to update my rerere database, so that
the fix-up can be carried forward in future merges to 'next' and
eventually 'master'.
For anybody interested, here is how a merge fix-up patch like yours can be
used:
1. First apply to the commit it is intended to be applied:
$ git co pu
$ git am your-patch
2. Re-attempt the merge. CG stands for "Commit Goal".
$ CG=$(git rev-parse HEAD)
$ git reset --hard HEAD^^
$ git merge pd/bash-4-completion
3. Clear the rerere database and redo the merge, letting it conflict.
$ git rerere forget contrib/completion/git-completion.bash
$ git reset --hard
$ git merge pd/bash-4-completion
4. Take the fixup and conclude the merge; this updates the rerere
database.
$ git checkout $CG .
$ git commit
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html