<div dir="ltr"><div>I remember now, I had added this to my .gitconfig before:<br><br>[pull]<br>    rebase = true<br><br></div>Apparently that didn't operate when I did my git pull.....<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 31, 2017 at 7:25 PM, David Christensen <span dir="ltr"><<a href="mailto:david@endpoint.com" target="_blank">david@endpoint.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
> On Jan 31, 2017, at 4:36 PM, Mike Heins <<a href="mailto:mike@heins.net">mike@heins.net</a>> wrote:<br>
><br>
> Damn. Isn't there a way to make this easy? git pull and git push doesn't seem to do it, and I don't have the Git-fu to easily remember what I am doing wrong...<br>
><br>
><br>
> On Tue, Jan 31, 2017 at 5:32 PM, Mike Heins <<a href="mailto:interchange-cvs@icdevgroup.org">interchange-cvs@icdevgroup.<wbr>org</a>> wrote:<br>
> commit 634097276d320052303b660d5e900f<wbr>be92c7e3ca<br>
> Merge: 81d1395... e287246...<br>
> Author: Mike Heins <<a href="mailto:mikeh@endpoint.com">mikeh@endpoint.com</a>><br>
> Date:   Tue Jan 31 17:32:30 2017 -0500<br>
><br>
>     Merge branch 'master' of ssh://<a href="http://git.icdevgroup.org/var/git/interchange" rel="noreferrer" target="_blank">git.icdevgroup.org/var/<wbr>git/interchange</a><br>
><br>
>  dist/strap/dbconf/mysql/<wbr>userdb.mysql |    4 ++--<br>
>  dist/strap/dbconf/pgsql/<wbr>userdb.pgsql |    8 ++++----<br>
>  dist/strap/dbconf/sqlite/<wbr>userdb.lite |    4 ++--<br>
>  3 files changed, 8 insertions(+), 8 deletions(-)<br>
> ---<br>
<br>
<br>
</span>You can configure your git pull to always rebase; an example (quickly reviewed, but not extensively tested):<br>
<br>
<a href="https://coderwall.com/p/tnoiug/rebase-by-default-when-doing-git-pull" rel="noreferrer" target="_blank">https://coderwall.com/p/<wbr>tnoiug/rebase-by-default-when-<wbr>doing-git-pull</a><br>
<br>
--<br>
David Christensen<br>
End Point Corporation<br>
<a href="mailto:david@endpoint.com">david@endpoint.com</a><br>
<a href="tel:785-727-1171" value="+17857271171">785-727-1171</a><br>
<div class="HOEnZb"><div class="h5"><br>
<br>
<br>
<br>
______________________________<wbr>_________________<br>
interchange-users mailing list<br>
<a href="mailto:interchange-users@icdevgroup.org">interchange-users@icdevgroup.<wbr>org</a><br>
<a href="http://www.icdevgroup.org/mailman/listinfo/interchange-users" rel="noreferrer" target="_blank">http://www.icdevgroup.org/<wbr>mailman/listinfo/interchange-<wbr>users</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">The problem with Internet quotations is that many of them<br>are not genuine. -- Abraham Lincoln<br></div>
</div>