You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by Willem Jiang <wi...@gmail.com> on 2014/11/06 01:38:05 UTC
Re: [4/4] git commit: merging upstream
Hi Claus,
After you pull the PR from other repository, you can run "git pull —rebase" to avoid the commit like merging upstream. It can make the commit log better for reading.
Regards,
--
Willem Jiang
Red Hat, Inc.
Web: http://www.redhat.com
Blog: http://willemjiang.blogspot.com (English)
http://jnn.iteye.com (Chinese)
Twitter: willemjiang
Weibo: 姜宁willem
On November 6, 2014 at 2:54:27 AM, davsclaus@apache.org (davsclaus@apache.org) wrote:
> > merging upstream
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19431d32
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19431d32
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19431d32
>
> Branch: refs/heads/master
> Commit: 19431d32a7518ed998b05f05e3edfbfb183397d0
> Parents: 4f709c5 d78abcf
> Author: Scott Stults
> Authored: Wed Nov 5 13:18:08(http://airmail.calendar/2014-11-05%2013:18:08%20GMT+8)
> 2014 -0500
> Committer: Scott Stults
> Committed: Wed Nov 5 13:18:08(http://airmail.calendar/2014-11-05%2013:18:08%20GMT+8)
> 2014 -0500
>
> ----------------------------------------------------------------------
Re: [4/4] git commit: merging upstream
Posted by Willem Jiang <wi...@gmail.com>.
Hi Scott,
It’s OK. You can do "git pull —rebase” before you sending a PR :)
Regards,
Willem
--
Willem Jiang
Red Hat, Inc.
Web: http://www.redhat.com
Blog: http://willemjiang.blogspot.com (English)
http://jnn.iteye.com (Chinese)
Twitter: willemjiang
Weibo: 姜宁willem
On November 6, 2014 at 9:09:55 AM, Scott Stults (sstults@opensourceconnections.com) wrote:
> Thank you, Willem. Only later did it occur to me that I should just catch
> my fork up before committing. My apologies for the additional work.
>
> -Scott
>
> On Wed, Nov 5, 2014 at 7:38 PM, Willem Jiang wrote:
>
> > Hi Claus,
> >
> > After you pull the PR from other repository, you can run "git pull
> > —rebase" to avoid the commit like merging upstream. It can make the commit
> > log better for reading.
> >
> > Regards,
> >
> >
> > --
> > Willem Jiang
> >
> > Red Hat, Inc.
> > Web: http://www.redhat.com
> > Blog: http://willemjiang.blogspot.com (English)
> > http://jnn.iteye.com (Chinese)
> > Twitter: willemjiang
> > Weibo: 姜宁willem
> >
> >
> >
> > On November 6, 2014 at 2:54:27 AM, davsclaus@apache.org (
> > davsclaus@apache.org) wrote:
> > > > merging upstream
> > >
> > >
> > > Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> > > Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19431d32
> > > Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19431d32
> > > Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19431d32
> > >
> > > Branch: refs/heads/master
> > > Commit: 19431d32a7518ed998b05f05e3edfbfb183397d0
> > > Parents: 4f709c5 d78abcf
> > > Author: Scott Stults
> > > Authored: Wed Nov 5 13:18:08(
> > http://airmail.calendar/2014-11-05%2013:18:08%20GMT+8)
> > > 2014 -0500
> > > Committer: Scott Stults
> > > Committed: Wed Nov 5 13:18:08(
> > http://airmail.calendar/2014-11-05%2013:18:08%20GMT+8)
> > > 2014 -0500
> > >
> > > ----------------------------------------------------------------------
> >
> >
>
>
> --
> Scott Stults | Founder & Solutions Architect | OpenSource Connections, LLC
> | 434.409.2780
> http://www.opensourceconnections.com
>
Re: [4/4] git commit: merging upstream
Posted by Scott Stults <ss...@opensourceconnections.com>.
Thank you, Willem. Only later did it occur to me that I should just catch
my fork up before committing. My apologies for the additional work.
-Scott
On Wed, Nov 5, 2014 at 7:38 PM, Willem Jiang <wi...@gmail.com> wrote:
> Hi Claus,
>
> After you pull the PR from other repository, you can run "git pull
> —rebase" to avoid the commit like merging upstream. It can make the commit
> log better for reading.
>
> Regards,
>
>
> --
> Willem Jiang
>
> Red Hat, Inc.
> Web: http://www.redhat.com
> Blog: http://willemjiang.blogspot.com (English)
> http://jnn.iteye.com (Chinese)
> Twitter: willemjiang
> Weibo: 姜宁willem
>
>
>
> On November 6, 2014 at 2:54:27 AM, davsclaus@apache.org (
> davsclaus@apache.org) wrote:
> > > merging upstream
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19431d32
> > Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19431d32
> > Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19431d32
> >
> > Branch: refs/heads/master
> > Commit: 19431d32a7518ed998b05f05e3edfbfb183397d0
> > Parents: 4f709c5 d78abcf
> > Author: Scott Stults
> > Authored: Wed Nov 5 13:18:08(
> http://airmail.calendar/2014-11-05%2013:18:08%20GMT+8)
> > 2014 -0500
> > Committer: Scott Stults
> > Committed: Wed Nov 5 13:18:08(
> http://airmail.calendar/2014-11-05%2013:18:08%20GMT+8)
> > 2014 -0500
> >
> > ----------------------------------------------------------------------
>
>
--
Scott Stults | Founder & Solutions Architect | OpenSource Connections, LLC
| 434.409.2780
http://www.opensourceconnections.com