Maybe the license is still free. You just need to ask for one. This seems
to be a precursor to a license purchase sometime in the future but it may
be free for now.
On Tue, May 12, 2020, 8:05 AM Kurt Jacobson wrote:
> Hello Reinhard,
>
> That's very disappointing. I thought GitKraken was still
Hello Reinhard,
That's very disappointing. I thought GitKraken was still completely free to
use.
I have used it since 2017 and have never had it ask for a licence file.
Maybe I am grandfathered in some how.
On Tue, May 12, 2020 at 12:53 AM Reinhard
wrote:
> On Montag, 11. Mai 2020, 23:18:32
On Montag, 11. Mai 2020, 23:18:32 CEST Kurt Jacobson wrote:
> GitKraken is unsurpassed for quickly viewing git commit history and file
> diffs.
> Unfortunately its not open source, but it is free to use.
Tried to install standalone version, as I wanted the functionality for my
local repos. But
Hi Kurt,
thank you very much for the hints!
I'll go for it.
cheers Reinhard
___
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
Reinhard,
GitKraken is unsurpassed for quickly viewing git commit history and file
diffs.
Unfortunately its not open source, but it is free to use.
https://www.gitkraken.com/
Another good git gui with good diff views is GitAhead.
If all you care about are git file diffs, meld is also very good
Hi Dewey,
thank you for your assistance!
On Sonntag, 10. Mai 2020, 15:15:26 CEST Dewey Garrett wrote:
> alias gitfile='git log --reverse --pretty=format:"%h %ai %s" '
Hm, looks like I was not good enuf to describe, what I'm looking for.
Thank you for the alias, but I prefer the default git
In <1974592.ZQxCF2d4iu@django019> Reinhard
writes:
>How can I view the different variants of a file through git history?
List commits for a file example (using src/Makefile):
$ alias gitfile='git log --reverse --pretty=format:"%h %ai %s" '
$ cd src
$ git status | head -1
On branch 2.8
$
Hi,
I'm not that used to git. Usually I use it for backup purpose only.
Lately I read about gitk. That's not bad to show what happened in one commit.
How can I view the different variants of a file through git history?
gitk filename shows the differences of each commit. Is there a way to see the
On Tuesday 14 April 2020 19:29:26 Gene Heskett wrote:
> On Tuesday 14 April 2020 18:27:20 andy pugh wrote:
> > On Tue, 14 Apr 2020 at 22:54, Gene Heskett
>
> wrote:
> > > > What's that # doing there?
> > >
> > > IIRC, removeing a later duplicate link.
> >
> > I don't see any duplication. Have
On Tuesday 14 April 2020 18:27:20 andy pugh wrote:
> On Tue, 14 Apr 2020 at 22:54, Gene Heskett
wrote:
> > > What's that # doing there?
> >
> > IIRC, removeing a later duplicate link.
>
> I don't see any duplication. Have you tried removing it?
did just now, no diff. It still runs away
On Tue, 14 Apr 2020 at 22:54, Gene Heskett wrote:
> > What's that # doing there?
> IIRC, removeing a later duplicate link.
I don't see any duplication. Have you tried removing it?
--
atp
"A motorcycle is a bicycle with a pandemonium attachment and is
designed for the especial use of
On Tuesday 14 April 2020 17:30:36 andy pugh wrote:
> On Tue, 14 Apr 2020 at 22:23, Gene Heskett
wrote:
> > net y-vel-cmd<= joint.1.vel-cmd # => pid_y.command-deriv
>
> What's that # doing there?
IIRC, removeing a later duplicate link.
Cheers, Gene Heskett
--
"There are four boxes to
On Tue, 14 Apr 2020 at 22:23, Gene Heskett wrote:
> net y-vel-cmd<= joint.1.vel-cmd # => pid_y.command-deriv
What's that # doing there?
--
atp
"A motorcycle is a bicycle with a pandemonium attachment and is
designed for the especial use of mechanical geniuses, daredevils and
lunatics."
On Tuesday 14 April 2020 12:35:01 andy pugh wrote:
> On Tue, 14 Apr 2020 at 16:29, Gene Heskett wrote:
> > which may be not enough but its building now. Keep in mind I have to
> > make debs and install them and reboot to try them
>
> You should be able to test with a run-in-place. If you are
On Tue, 14 Apr 2020 at 16:29, Gene Heskett wrote:
> which may be not enough but its building now. Keep in mind I have to make
> debs and install them and reboot to try them
You should be able to test with a run-in-place. If you are compiling
on the machine under test then you don't need debs.
On Tuesday 14 April 2020 06:07:31 andy pugh wrote:
> On Tue, 14 Apr 2020 at 10:33, Gene Heskett
wrote:
> > How, since even the newer, bad code runs thru runtests w/o any
> > problems,
> Bisect does not care how you test. But it is probably easiest to run
> it on the machine that is showing
On Tue, 14 Apr 2020 at 10:33, Gene Heskett wrote:
> How, since even the newer, bad code runs thru runtests w/o any problems,
Bisect does not care how you test. But it is probably easiest to run
it on the machine that is showing the problem.
> Can someone suggest a starting branch that ideally
Greetings all;
git-bisect has more options than a new car.
How, since even the newer, bad code runs thru runtests w/o any problems,
I need to setup a git bisect start slightly before the 2.8 merge
started, then bring it up to head=master & bad.
Can someone suggest a starting branch that
> Sent: July 20, 2019 12:02 AM
> To: linuxcnc-developers
> Subject: Re: [Emc-developers] Git lost
>
> Sorry, I don’t want to actually do this.
>
> I was just asking the question because I saw all those commits and I wasn’t
> sure what to do.
>
> I really don’t w
If it's just Roberts's stuff in 2.8 you are worried about - it seems to merge
cleanly to master - go for it.
Chris
From: Phillip Carter
Sent: July 20, 2019 12:02 AM
To: linuxcnc-developers
Subject: Re: [Emc-developers] Git lost
Sorry, I don’t want
icate merges later..
>
> Now you can see why it's nice when a committer merges things right away so
> they can deal with their own code.
>
> Chris
>
>
> From: Phillip Carter
> Sent: July 20, 2019 12:02 AM
> To: linuxcnc-developers
> S
code.
Chris
From: Phillip Carter
Sent: July 20, 2019 12:02 AM
To: linuxcnc-developers
Subject: Re: [Emc-developers] Git lost
Sorry, I don’t want to actually do this.
I was just asking the question because I saw all those commits and I wasn’t
sure what to do
en-merging
>
> Chris
>
>
> From: Phillip Carter
> Sent: July 19, 2019 11:33 PM
> To: linuxcnc-developers
> Subject: Re: [Emc-developers] Git lost
>
>
>
>> On 20 Jul 2019, at 12:13 am, andy pugh wrote:
>>
>> On Fri, 19 Jul 2019 at
-commits-when-merging
Chris
From: Phillip Carter
Sent: July 19, 2019 11:33 PM
To: linuxcnc-developers
Subject: Re: [Emc-developers] Git lost
> On 20 Jul 2019, at 12:13 am, andy pugh wrote:
>
> On Fri, 19 Jul 2019 at 10:54, Phillip Carter
> wrote:
&g
On Sat, 20 Jul 2019 at 00:35, Phillip Carter
wrote:
What happens in the case that something was meant for 2.8 but not for
> master, how is that prevented from being merged up in the future?
That's a very good question. And one to which I wish I had the answer
--
atp
"A motorcycle is a
> On 20 Jul 2019, at 12:13 am, andy pugh wrote:
>
> On Fri, 19 Jul 2019 at 10:54, Phillip Carter
> wrote:
>
>> Oops, yes, after Tested should be Switched to master
>
>
> OK, so you are about to merge some changes that are in 2.8, not in master,
> and were not made by you.
>
Correct
> I
On Fri, 19 Jul 2019 at 10:54, Phillip Carter
wrote:
> Oops, yes, after Tested should be Switched to master
OK, so you are about to merge some changes that are in 2.8, not in master,
and were not made by you.
I think that is probably OK. The norm in LinuxCNC is to put changes in the
earliest
Oops, yes, after Tested should be Switched to master.Cheers, Phill
Original message From: andy pugh Date:
19/7/19 7:27 pm (GMT+10:00) To: EMC developers
Subject: Re: [Emc-developers] Git lost
On Fri, 19 Jul 2019 at 08:01, Phillip Carter wrote:> I
am working on 2.8 loca
On Fri, 19 Jul 2019 at 08:01, Phillip Carter
wrote:
> I am working on 2.8 locally, I have:
> Pulled from origin
> Modified some files
> Committed
> Tested
> Switched to 2.8
> Pulled from origin
> Merged 2.8
> Now there are commits that I am not sure belong in master
>
Should one of those 2.8s
I am working on 2.8 locally, I have:
Pulled from origin
Modified some files
Committed
Tested
Switched to 2.8
Pulled from origin
Merged 2.8
Now there are commits that I am not sure belong in master
I am not sure where to go from here.
___
From: Sebastian Kuzminsky
>I have experience with git submodules, and I am very much not a fan.
>submodules are occasionally useful, but it's a suboptimal solution. My
>main objection is that they introduce additional complexity into the
>project's revision
>
> On 2 July 2018 at 16:17, Kurt Jacobson wrote:
>
> > But there are other, maybe better, options.. since QtVCP is basically a
> > python package already, it would be straight forward to make it a proper
> > package and put it on PyPi. The advantage of that is that it could be
> > installed with
On 2 July 2018 at 16:17, Kurt Jacobson wrote:
> But there are other, maybe better, options.. since QtVCP is basically a
> python package already, it would be straight forward to make it a proper
> package and put it on PyPi. The advantage of that is that it could be
> installed with pip install
Chris, I am a very strong proponent of having the UIs live in separate
repositories.
It would keep the LCNC tree cleaner, keep dependencies to a minimum, make
maintenance and development of the UIs more straight froward and would also
allow the UI to have its own issue tracker, which I think would
On Monday 02 July 2018 01:58:27 Chris Morley wrote:
> In the fairly near future I intend to add Qtvcp/Qtscreen to linuxcnc.
>
> This is a python/Qt based virtual control panel similar to gladevcp.
>
>
> I am wondering if keeping the project separate from linuxcnc by using
> a subtree or sub
In the fairly near future I intend to add Qtvcp/Qtscreen to linuxcnc.
This is a python/Qt based virtual control panel similar to gladevcp.
I am wondering if keeping the project separate from linuxcnc by using a subtree
or sub module is a good idea.
I ask this question without knowing very
Thanks for the replies. I had already blown it away and cloned it again. I
am back where I was before trying to fix it with git. :)
I will try to 'fix' it again in the next couple days.
--
Addressee is the intended audience.
If you are not the addressee then my consent is not given for you to
If you still have issues after following seb's instructions, I suggest simply
recloning if you're new to git.
$ git clone -b 2.7 --single-branch --depth=1
git://git.linuxcnc.org/git/linuxcnc.git linuxcnc_2.7_new
You'll then automatically be on the 2.7 current stable branch without the
entire
On 04/20/2017 12:31 PM, Stuart Stevenson wrote:
> I get this message when running 'git pull' in my 2.7 directory.
>
> this doesn't make sense to me so what is it saying?
>
> enshu@enshu:~/linuxcnc2.7-dev/src$ git status
> # On branch 2.7-ilowpass-fix
> # Your branch is ahead of
I get this message when running 'git pull' in my 2.7 directory.
this doesn't make sense to me so what is it saying?
enshu@enshu:~/linuxcnc2.7-dev/src$ git status
# On branch 2.7-ilowpass-fix
# Your branch is ahead of 'origin/2.7-ilowpass-fix' by 7 commits.
#
# Untracked files:
# (use "git add
I have not seen this go out to the local community:
Vulnerability announced: update your Git clients
https://github.com/blog/1938-git-client-vulnerability-announced
Since a lot of things a few of us do use git/github, it would be a good
idea for people to update their toolchain as soon
On Sunday 21 December 2014 18:40:22 EBo did opine
And Gene did reply:
I have not seen this go out to the local community:
Vulnerability announced: update your Git clients
https://github.com/blog/1938-git-client-vulnerability-announced
Since a lot of things a few of us do use
300Kb of 207.8 Mb... hardly think in today's world anyone would notice
such a small amount of data. And as Andy pointed out not all are
generated files.
On 2/26/2014 2:42 PM, Robert Ellenberg wrote:
Hi All,
There is a folder called man9 in the docs/man folder:
linuxcnc-root/docs/man/man9
On 26 February 2014 20:42, Robert Ellenberg rwe...@gmail.com wrote:
linuxcnc-root/docs/man/man9
As far as I can tell, every file here is generated when building linuxcnc.
Is this the case?
No, some of them are hand-written.
(Several by me)
Only the manpages that describe comp components are
On Wednesday 26 February 2014 16:00:09 Robert Ellenberg did opine:
Hi All,
There is a folder called man9 in the docs/man folder:
linuxcnc-root/docs/man/man9
As far as I can tell, every file here is generated when building
linuxcnc. Is this the case? It also seems like many of these .9
Am 30.09.2011 um 04:09 schrieb Sebastian Kuzminsky:
...
And if that wasnt enough to make you a little weak in the knees and/or
dizzy, check out git rebase --interactive. It lets you rewrite and
clean up local history before pushing to the shared repo... But that'll
be the topic for
What am I doing wrong? I keep pushing trivial merges by accident.
My process is to work in a separate branch, then cherry-pick the
commits into my tracking branch, then push --dry-run and git log to
make sure it looks right, then push.
So, what part of that process is pushing a merge?
--
atp
When I tried to push today I got an error.
First with dry-run no problem:
chris@chris-aspire-laptop:~/emc2-dev/src$ git push --dry-run
To ssh://cmor...@git.linuxcnc.org/git/emc2.git
ccc20ad..6692f70 HEAD - v2.5_branch
then with push:
chris@chris-aspire-laptop:~/emc2-dev/src$ git push
On Mon, Sep 19, 2011 at 07:49:27AM +, Chris Morley wrote:
error: insufficient permission for adding an object to repository database
./objects
Oops, fixed, please try again.
--
BlackBerryreg; DevCon Americas,
On Fri, Sep 16, 2011 at 12:43:06AM +0100, andy pugh wrote:
I just pushed a commit and got an odd series of messages (also, there
was no announcement on #emc-devel)
Fixed, thanks!
--
BlackBerryreg; DevCon Americas, Oct.
I just pushed a commit and got an odd series of messages (also, there
was no announcement on #emc-devel)
It does look as if the push got through.
Counting objects: 11, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6),
That's cool!
Though may i suggest: '(cd src; make make test)'
--
Sebastian Kuzminsky
- Reply message -
From: Michael Haberler mai...@mah.priv.at
Date: Fri, Feb 25, 2011 04:11
Subject: [Emc-developers] git: testing a branch for every commit being
buildable with git-test-sequence
One answer that comes to mind is to remember this, and on the master
branch revert the commit after the merge that introduces it.
X--o--A--o--o [v2.4_branch]
\\
o--o--o--M--A' [master]
X represents the place where we branched 2.4, A represents the change
to
On Sun, Feb 21, 2010 at 08:44:05PM +, Chris Morley wrote:
One answer that comes to mind is to remember this, and on the master
branch revert the commit after the merge that introduces it.
X--o--A--o--o [v2.4_branch]
\\
o--o--o--M--A' [master]
X
The common ancestor of v2.4_branch and master is now Y, not X, so git
only considers changes from Y to Z at the next merge, so the problematic
commit A isn't in the list. (git determines this automatically
I had hoped it was smart like that ! great
Truthfully I don't understand why we
That's a good question, and I don't immediately have the right answer.
One answer that comes to mind is to remember this, and on the master
branch revert the commit after the merge that introduces it.
X--o--A--o--o [v2.4_branch]
\\
o--o--o--M--A' [master]
X represents the
At this point we may want to investigate some of the workflows suggested
in the gitworkflows[1] document. Specifically, here's how we can use
topic branches, integration branches and merging upwards to put safe new
features in 2.4.x after they're proven on master:
pncconf in 2.4 will
You may find stgit useful.
Regards,
Alex.
Chris Morley пишет:
At this point we may want to investigate some of the workflows suggested
in the gitworkflows[1] document. Specifically, here's how we can use
topic branches, integration branches and merging upwards to put safe new
features
Is the git repository down?
I always get The remote end hung up unexpectedly when trying to pull.
--
Greetings, Michael.
--
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify
On Monday 09 November 2009 23:02:31 Chris Radek wrote:
On Mon, Nov 09, 2009 at 10:37:59PM +0100, Michael Buesch wrote:
Is the git repository down?
I always get The remote end hung up unexpectedly when trying to pull.
It was down for about 10 minutes due to a power problem. It is fixed
On Monday 09 November 2009 23:11:52 Michael Buesch wrote:
On Monday 09 November 2009 23:02:31 Chris Radek wrote:
On Mon, Nov 09, 2009 at 10:37:59PM +0100, Michael Buesch wrote:
Is the git repository down?
I always get The remote end hung up unexpectedly when trying to pull.
It was
On Mon, Nov 09, 2009 at 11:14:41PM +0100, Michael Buesch wrote:
Hm, I do still get it.
Routing to the machine seems to work, however. I can ping and traceroute it.
m...@homer:~/develop/git/emc2$ git pull
fatal: The remote end hung up unexpectedly
Cannot get the repository state from
On Monday 09 November 2009 23:19:06 Chris Radek wrote:
On Mon, Nov 09, 2009 at 11:14:41PM +0100, Michael Buesch wrote:
Hm, I do still get it.
Routing to the machine seems to work, however. I can ping and traceroute it.
m...@homer:~/develop/git/emc2$ git pull
fatal: The remote end
On Thu, Jul 02, 2009 at 04:09:22AM +, Chris Morley wrote:
It does seem to promote waiting to push until
something is quite far along - not sure if thats
goos or bad. Good cause trunk is more stable
bad cause you could get along ways before
you find out about problems from interaction
of
Is there anyway to push a specific file with
out pushing other already committed files?
Also how does one diff already committed files
to whats in master so i can confirm the changes
before pushing. (is that git diff --cached)
in cvs i could modify all kinds of files and then
commit (push in
On Thu, Jul 02, 2009 at 01:55:18AM +, Chris Morley wrote:
Is there anyway to push a specific file with
out pushing other already committed files?
Go ahead and commit the last bit of work, so that your tree is clean
according to 'git status'
(Before continuing with these instructions, feel
Date: Wed, 1 Jul 2009 22:17:38 -0500
From: jep...@unpythonic.net
To: emc-developers@lists.sourceforge.net
Subject: Re: [Emc-developers] git questions
On Thu, Jul 02, 2009 at 01:55:18AM +, Chris Morley wrote:
Is there anyway to push a specific file with
out pushing other already
67 matches
Mail list logo
