[ic] [interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange

[Jon Jensen]

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 at icdevgroup.org>
> wrote:
>
>> commit 634097276d320052303b660d5e900fbe92c7e3ca
>> Merge: 81d1395... e287246...
>> Author: Mike Heins <mikeh at 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 at icdevgroup.org
>> http://www.icdevgroup.org/mailman/listinfo/interchange-cvs
>>
>

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