Mailing List Archive

Mike,

I'm not sure what it is you want to make easy exactly, but maybe you mean
rebasing your commits so you don't get the "Merge branch ..." commit?

If that's the case, then you want to rebase rather than merge.

I always find it wise first to make a backup branch of your work just in
case the rebase goes very wrong:

git branch safekeeping-1

Then do:

git pull --rebase

And review your commits before pushing them out:

git log origin..

Use `git log -p` to see complete diffs, or just `git log --stat` to see
names + line counts of files changed.

If you meant something else, let us know.

Jon



On Tue, 31 Jan 2017, Mike Heins wrote:

> 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...
>
>
> On Tue, Jan 31, 2017 at 5:32 PM, Mike Heins <interchange-cvs@icdevgroup.org>
> wrote:
>
>> commit 634097276d320052303b660d5e900fbe92c7e3ca
>> Merge: 81d1395... e287246...
>> Author: Mike Heins <mikeh@endpoint.com>
>> Date: Tue Jan 31 17:32:30 2017 -0500
>>
>> Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
>>
>> dist/strap/dbconf/mysql/userdb.mysql | 4 ++--
>> dist/strap/dbconf/pgsql/userdb.pgsql | 8 ++++----
>> dist/strap/dbconf/sqlite/userdb.lite | 4 ++--
>> 3 files changed, 8 insertions(+), 8 deletions(-)
>> ---
>>
>> _______________________________________________
>> interchange-cvs mailing list
>> interchange-cvs@icdevgroup.org
>> http://www.icdevgroup.org/mailman/listinfo/interchange-cvs
>>
>

--
Jon Jensen
End Point Corporation
https://www.endpoint.com/

_______________________________________________
interchange-users mailing list
interchange-users@icdevgroup.org
http://www.icdevgroup.org/mailman/listinfo/interchange-users

> On Jan 31, 2017, at 4:36 PM, Mike Heins <mike@heins.net> wrote:
>
> 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...
>
>
> On Tue, Jan 31, 2017 at 5:32 PM, Mike Heins <interchange-cvs@icdevgroup.org> wrote:
> commit 634097276d320052303b660d5e900fbe92c7e3ca
> Merge: 81d1395... e287246...
> Author: Mike Heins <mikeh@endpoint.com>
> Date: Tue Jan 31 17:32:30 2017 -0500
>
> Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
>
> dist/strap/dbconf/mysql/userdb.mysql | 4 ++--
> dist/strap/dbconf/pgsql/userdb.pgsql | 8 ++++----
> dist/strap/dbconf/sqlite/userdb.lite | 4 ++--
> 3 files changed, 8 insertions(+), 8 deletions(-)
> ---


You can configure your git pull to always rebase; an example (quickly reviewed, but not extensively tested):

https://coderwall.com/p/tnoiug/rebase-by-default-when-doing-git-pull

--
David Christensen
End Point Corporation
david@endpoint.com
785-727-1171




_______________________________________________
interchange-users mailing list
interchange-users@icdevgroup.org
http://www.icdevgroup.org/mailman/listinfo/interchange-users

I remember now, I had added this to my .gitconfig before:

[pull]
rebase = true

Apparently that didn't operate when I did my git pull.....

On Tue, Jan 31, 2017 at 7:25 PM, David Christensen <david@endpoint.com>
wrote:

>
> > On Jan 31, 2017, at 4:36 PM, Mike Heins <mike@heins.net> wrote:
> >
> > 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...
> >
> >
> > On Tue, Jan 31, 2017 at 5:32 PM, Mike Heins <interchange-cvs@icdevgroup.
> org> wrote:
> > commit 634097276d320052303b660d5e900fbe92c7e3ca
> > Merge: 81d1395... e287246...
> > Author: Mike Heins <mikeh@endpoint.com>
> > Date: Tue Jan 31 17:32:30 2017 -0500
> >
> > Merge branch 'master' of ssh://git.icdevgroup.org/var/
> git/interchange
> >
> > dist/strap/dbconf/mysql/userdb.mysql | 4 ++--
> > dist/strap/dbconf/pgsql/userdb.pgsql | 8 ++++----
> > dist/strap/dbconf/sqlite/userdb.lite | 4 ++--
> > 3 files changed, 8 insertions(+), 8 deletions(-)
> > ---
>
>
> You can configure your git pull to always rebase; an example (quickly
> reviewed, but not extensively tested):
>
> https://coderwall.com/p/tnoiug/rebase-by-default-when-doing-git-pull
>
> --
> David Christensen
> End Point Corporation
> david@endpoint.com
> 785-727-1171
>
>
>
>
> _______________________________________________
> interchange-users mailing list
> interchange-users@icdevgroup.org
> http://www.icdevgroup.org/mailman/listinfo/interchange-users
>



--
The problem with Internet quotations is that many of them
are not genuine. -- Abraham Lincoln