Mailing List Archive: Interchange: users

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

Index | Next | Previous | View Threaded

mike at perusion

Jul 12, 2013, 9:40 AM

Post #1 of 4 (52 views)
Permalink

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

Quoting Mike Heins (interchange-cvs [at] icdevgroup):
> commit 779ddaa9e66892b733dd0e6e334469bc19426216
> Merge: f8a7be3... 881ef54...
> Author: Mike Heins <heins [at] icdevgroup>
> Date: Fri Jul 12 12:35:41 2013 -0400
>
> Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
>
> MANIFEST | 2 +
> Makefile.PL | 4 +-
> README | 6 +-
> README.rpm-dist | 12 ++--
> SPECS/interchange.spec | 5 +-
> WHATSNEW-5.7 | 146 ++++++++++++++++++++++++++++++++
> configure | 2 +-
> dist/standard/products/mv_metadata.asc | 2 +-
> dist/standard/variables/COPYRIGHT | 2 +-
> scripts/interchange.PL | 12 ++--
> 10 files changed, 172 insertions(+), 21 deletions(-)

What's this? Hope I didn't mess anything up. All I did was a git
pull....I am no git guru, by any manner or means, but I thought
that was safe.

--
Mike Heins
Perusion -- Expert Interchange Consulting http://www.perusion.com/
phone +1.765.253.4194 <mike [at] perusion>

"We will have peace with the Arabs when they love their children more
than they hate us". -- Golda Meir

_______________________________________________
interchange-users mailing list
interchange-users [at] icdevgroup
http://www.icdevgroup.org/mailman/listinfo/interchange-users

david at endpoint

Jul 12, 2013, 9:46 AM

Post #2 of 4 (50 views)
Permalink

Re: [interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange [In reply to]

On Jul 12, 2013, at 11:40 AM, Mike Heins wrote:

> Quoting Mike Heins (interchange-cvs [at] icdevgroup):
>> commit 779ddaa9e66892b733dd0e6e334469bc19426216
>> Merge: f8a7be3... 881ef54...
>> Author: Mike Heins <heins [at] icdevgroup>
>> Date: Fri Jul 12 12:35:41 2013 -0400
>>
>> Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
>>
>> MANIFEST | 2 +
>> Makefile.PL | 4 +-
>> README | 6 +-
>> README.rpm-dist | 12 ++--
>> SPECS/interchange.spec | 5 +-
>> WHATSNEW-5.7 | 146 ++++++++++++++++++++++++++++++++
>> configure | 2 +-
>> dist/standard/products/mv_metadata.asc | 2 +-
>> dist/standard/variables/COPYRIGHT | 2 +-
>> scripts/interchange.PL | 12 ++--
>> 10 files changed, 172 insertions(+), 21 deletions(-)
>
> What's this? Hope I didn't mess anything up. All I did was a git
> pull....I am no git guru, by any manner or means, but I thought
> that was safe.

This was from a set of changes I had pushed earlier with updated versions, copyright dates, and notes for the release; it should be fine.

Regards,

David
--
David Christensen
End Point Corporation
david [at] endpoint
785-727-1171

_______________________________________________
interchange-users mailing list
interchange-users [at] icdevgroup
http://www.icdevgroup.org/mailman/listinfo/interchange-users

jon at endpoint

Jul 12, 2013, 10:02 AM

Post #3 of 4 (50 views)
Permalink

Re: [interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange [In reply to]

On Fri, 12 Jul 2013, Mike Heins wrote:

> What's this? Hope I didn't mess anything up. All I did was a git
> pull....I am no git guru, by any manner or means, but I thought that was
> safe.

Generally you ought to do `git pull --rebase` instead of a plain git pull
that defaults to merging. The rebase relayers your commit(s) on top of
whatever else is already in the repo and avoids that extra ugly merge
commit that is usually unhelpful.

Jon

_______________________________________________
interchange-users mailing list
interchange-users [at] icdevgroup
http://www.icdevgroup.org/mailman/listinfo/interchange-users

mike at perusion

Jul 12, 2013, 10:08 AM

Post #4 of 4 (50 views)
Permalink

Re: [interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange [In reply to]

Quoting Jon Jensen (jon [at] endpoint):
> On Fri, 12 Jul 2013, Mike Heins wrote:
>
> >What's this? Hope I didn't mess anything up. All I did was a git
> >pull....I am no git guru, by any manner or means, but I thought
> >that was safe.
>
> Generally you ought to do `git pull --rebase` instead of a plain git
> pull that defaults to merging. The rebase relayers your commit(s) on
> top of whatever else is already in the repo and avoids that extra
> ugly merge commit that is usually unhelpful.

Got it.

--
Mike Heins
Perusion -- Expert Interchange Consulting http://www.perusion.com/
phone +1.765.253.4194 <mike [at] perusion>

If you think nobody cares if you're alive, try missing a couple of
car payments. -- Earl Wilson

_______________________________________________
interchange-users mailing list
interchange-users [at] icdevgroup
http://www.icdevgroup.org/mailman/listinfo/interchange-users

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads