Barry Smith writes:
> Jed,
>
>What the fuck is this doing in master?
It is not in 'master'.
$ git branch -r --contains 4b4eb8d
bb/jed/mat-assembly-perf
bb/next
Is something wrong with the script?
>It has sent email for weeks and weeks from next with this exact
>warning mess
Jed,
What the fuck is this doing in master? It has sent email for weeks and weeks
from next with this exact warning message and should never have been moved over
to master until the error was fixed. It is inexcusable that this problem got
moved into master after it was broken so long in
An additional note: One has to remember the following about git - to
avoid potential misinterpretation of the status flag.
origin/branchname is a local representation of 'branchname' that is
present in the remoterepo. But its not a direct reference to
remoterepo/branchname.
i.e in '/home/balay/pe
On Mon, 1 Jun 2015, Mark Adams wrote:
> >
> >
> > Also 'git-prompt.sh' helps in tracking changes to any giving 'branch'
> > wrt 'origin/branch'.. [assuming you do a 'git fetch' to sync changes
> > from remote repo]
> >
> >
> I use (a) git-prompt.sh. It shows the branch in the prompt. How does it
>
>
> Also 'git-prompt.sh' helps in tracking changes to any giving 'branch'
> wrt 'origin/branch'.. [assuming you do a 'git fetch' to sync changes
> from remote repo]
>
>
I use (a) git-prompt.sh. It shows the branch in the prompt. How does it
help? Does it do the .. stuff?
> Satish
>
Thanks,
On Mon, Jun 1, 2015 at 11:15 AM, Satish Balay wrote:
> On Mon, 1 Jun 2015, Mark Adams wrote:
>
> > > To see what the local commits are - You would do:
> > >
> > > git fetch # this way origin/master is the latest
> > > git log origin/master..master
> > > or
> > > gitk origin/master..maste
On Mon, 1 Jun 2015, Mark Adams wrote:
> > To see what the local commits are - You would do:
> >
> > git fetch # this way origin/master is the latest
> > git log origin/master..master
> > or
> > gitk origin/master..master
> >
> >
> This looks like what I want. does this list the differences betwee
On Mon, 1 Jun 2015, Mark Adams wrote:
> Matt, I just cloned PETSc/master. I did not create any branches.
Cloning over network can be easily avoided by using local clones.
And to reset 'master' [and abandon your current changes to it] - you could
either do:
git checkout someotherbranch
git bra
On Mon, Jun 1, 2015 at 10:59 AM, Satish Balay wrote:
> On Mon, 1 Jun 2015, Mark Adams wrote:
>
> > Let me summarize what I did (and showed the raw output in my original
> > email) on a branch named master that is from a relatively new clone:
> >
> > > git pull origin master
>
> If you are on 'mas
On Mon, 1 Jun 2015, Mark Adams wrote:
> Let me summarize what I did (and showed the raw output in my original
> email) on a branch named master that is from a relatively new clone:
>
> > git pull origin master
If you are on 'master' then you would just do a 'git pull'
Are you sure you are on ma
On Mon, Jun 1, 2015 at 9:23 AM, Matthew Knepley wrote:
> On Mon, Jun 1, 2015 at 8:08 AM, Mark Adams wrote:
>
>>
>>>
>>> Send the command that you used to create the branch.
>>>
>>>
>> Matt, I just cloned PETSc/master. I did not create any branches.
>>
>
> 1) Cloning just creates a repository st
On Mon, Jun 1, 2015 at 8:08 AM, Mark Adams wrote:
>
>>
>> Send the command that you used to create the branch.
>>
>>
> Matt, I just cloned PETSc/master. I did not create any branches.
>
1) Cloning just creates a repository structure. You have to keep pulling to
get things up to date.
2) You ar
>
>
>
> Send the command that you used to create the branch.
>
>
Matt, I just cloned PETSc/master. I did not create any branches.
Thanks,
>
> Matt
>
>
>> Anyway, I've blown it away and am starting with a fresh clone.
>>
>> Thanks again,
>>
>>
>>
>>>Matt
>>>
>>>
Thanks,
Mark
>>
On Mon, Jun 1, 2015 at 7:22 AM, Mark Adams wrote:
>
>>
>> Right before you make the branch from master, you should pull. If you
>> pull, you will be 0 commits ahead.
>>
>>
> Matt, I am not branching from master. I have checked out maint in the
> past week, but don't even think I have do that thi
>
>
>
> Right before you make the branch from master, you should pull. If you
> pull, you will be 0 commits ahead.
>
>
Matt, I am not branching from master. I have checked out maint in the past
week, but don't even think I have do that this clone.
Anyway, I've blown it away and am starting with a
On Mon, Jun 1, 2015 at 7:16 AM, Mark Adams wrote:
> On Mon, Jun 1, 2015 at 8:05 AM, Matthew Knepley wrote:
>
>> On Sun, May 31, 2015 at 9:20 PM, Mark Adams wrote:
>>
>>> I have asked this question before but I still do not understand what git
>>> is doing here.
>>>
>>> I pulled, made a fix, did
On Mon, Jun 1, 2015 at 8:05 AM, Matthew Knepley wrote:
> On Sun, May 31, 2015 at 9:20 PM, Mark Adams wrote:
>
>> I have asked this question before but I still do not understand what git
>> is doing here.
>>
>> I pulled, made a fix, did a git status, and I see that I am 7 commits
>> ahead of mast
On Sun, May 31, 2015 at 9:20 PM, Mark Adams wrote:
> I have asked this question before but I still do not understand what git
> is doing here.
>
> I pulled, made a fix, did a git status, and I see that I am 7 commits
> ahead of master. I commit and I am 8 commits ahead of master. What are
> the
18 matches
Mail list logo
