Re: [interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
David Christensen <[email protected]>
| Newsgroups | gmane.comp.web.interchange.users |
|---|---|
| Message-ID | <[email protected]> |
> On Jan 31, 2017, at 4:36 PM, Mike Heins <[email protected]> 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 <[email protected]> wrote: > commit 634097276d320052303b660d5e900fbe92c7e3ca > Merge: 81d1395... e287246... > Author: Mike Heins <[email protected]> > 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 [email protected] 785-727-1171