From mboxrd@z Thu Jan 1 00:00:00 1970 From: Prafulla Wadaskar Date: Tue, 18 Oct 2011 21:01:19 -0700 Subject: [U-Boot] Pull request for u-boot-marvell.git In-Reply-To: <4E9DBDC6.9020708@aribaud.net> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de > -----Original Message----- > From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net] > Sent: Tuesday, October 18, 2011 11:26 PM > To: Prafulla Wadaskar > Cc: u-boot at lists.denx.de; wd at denx.de; Ashish Karkare; Prabhanjan Sarnaik > Subject: Re: Pull request for u-boot-marvell.git > > Hi Prafulla, > > Le 18/10/2011 13:12, Prafulla Wadaskar a ?crit : > > Hi Albert > > > > Please kindly pull > > The following changes since commit > 0e005ee09d3424e2780efc6895fcbfbdf7a492fa: > > Prafulla Wadaskar (1): > > Merge branch 'master' of > git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster > > This commit is not present in u-boot-arm... It is the result of a merge > of u-boot-arm/master into u-boot-marvell/master. This is not the way a > pull request should be prepared according to the U-Boot Wiki. > > I would much prefer you to fetch u-boot-arm/master, then rebase your > master branch onto it, then request a pull relative to > u-boot-arm/master, i.e. use the following commands (assuming your git > setup has a remote called u-boot-arm) > > git fetch u-boot-arm > git checkout master > git rebase u-boot-arm/master > git push ... > git request-pull Hi Albert I followed similar process(instead of git fetch I am using git pull, and I am not sure git push and git pull-request are interchanged). I will check and let you know. I will regenerate a new pull request. Regards.. Prafulla . .