lict-resolving merges).
That's speculation on my part. I'll confirm this before I finish and
submit the patch.
yours sincerely,
Julius Musseau
On Thu, Feb 22, 2018 at 10:04 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Julius Musseau <jul...@mergebase.com> writes:
>
>> git squash []
>>
>> Squashes ..HEAD into a single commit. Replaces HEAD with the
>> result. If not specified, defaults
quashed some commits)
6. undo of 5
So far "git pull --rebase" does the exact right thing in every case!
If anyone knows a scenario where "git pull --rebase" fails to do the
right thing, I would be very grateful to hear of it.
Thanks!
yours sincerely,
Julius Musseau
3 matches
Mail list logo