Re: diff display

2008-09-12 Thread James A. Donald
On Wed, 10 Sep 2008 23:10:15 +0200, Kamaraju S Kusumanchi
[EMAIL PROTECTED] wrote:

 James A. Donald wrote:
 
  Can I get file changes recorded in git to display the
  way they do in windows?
 
 I am surprised that no one has told this till now.
 
 The main purpose of diff is to generate a patch which can then be used to
 apply/revert changes across two versions of a file. The output produced by
 diff can do that very efficiently. It is very compact and elegant format of
 showing differences between two files (although it requires a trained eye).
 If you want to get acquainted with diff output, read its documentation by
 doing 'info diff'.
 
 As for your problem, try vimdiff or gvimdiff (graphical version of vimdiff).
 These two programs do what you want.

gvimdiff seems to do what I want.  

--
  --
We have the right to defend ourselves and our property, because 
of the kind of animals that we are. True law derives from this 
right, not from the arbitrary power of the omnipotent state.

http://www.jim.com/  James A. Donald


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



diff display

2008-09-10 Thread James A. Donald
Under windows, diff usually works like windiff - you see
the two versions side by side, with the differences
highlighted by color

git-gui, however gives me a diff where I see a single
stream annotated with + and -

I find the single stream display really obscure, ugly, 
and confusing.

So if I had a file that used to be
first
error
anoth
more
again

And it was changed to

first
anoth 
new 
again

Then the linux tools I have now would display the
changes as
 first
-error
 anoth
-more 
+new
 again

While the windows tools I am used to would display it as
two streams side by side
 first   first
-error
 anoth   anoth
-more   +new
 again   again

but with color highlighting instead of + and -

Can I get file changes recorded in git to display the 
way they do in windows? 

--
  --
We have the right to defend ourselves and our property, because 
of the kind of animals that we are. True law derives from this 
right, not from the arbitrary power of the omnipotent state.

http://www.jim.com/  James A. Donald


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: apt-get: Command not found.

2005-08-05 Thread James A. Donald
On Tue, 02 Aug 2005 09:40:11 +0200, Gene Heskett
[EMAIL PROTECTED] wrote:

 On Tuesday 02 August 2005 03:05, James A. Donald wrote:
 apt-get: Command not found.
 
 I am a newbie to linux.  I recently installed Debian on a computer
 that sits in a closet
 
 So I ssh in.  I got Samba working fine, after tinkering with the
 /etc/samba/smb.conf file to read:
 
 [global]
 workgroup = workgroup
 netbios name = linux
 security = share
 [shareRW]
 path =  /home/james/Documents/sharedRW
 read only = No
 guest ok = Yes
 
 and manually starting the daemons with
 nmbd -D
 smbd -D
 
 All was well
 
 But then I wanted it to automatically start the daemons on reboot,
  and I had no idea how to do that.
 
 So I said to myself, well, surely Debian knows how to do that, so
 attempted to type
 
 apt-get update
 apt-get install samba smbclient
 
 Only to get the surprising message: apt-get: Command not found.


 Did you use the - option to su when you became root to do that stuff?
 
 I doubt that apt-get or any of its ilk are available if you do a plain 
 su, which, unlike doing an 'su -' does not give you roots $PATH.

Yes, I tried it all ways. 

--
http://www.jim.com


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: apt-get: Command not found.

2005-08-05 Thread James A. Donald
James A. Donald:
  I conjecture that apt-get has been replaced with some cool gui based
  configuration tool, and apt-get is no longer on the path.

 Jochen Schulz
 It is. All of the fancy GUI programs rely on apt-get so it still has to
 be there.

I assure you, apt-get is *not* on the path.

Pardon, me, problem is glaringly obvious.  I have Suse installed, and
Suse uses Yast

I thought I had debian installed.  Sorry.




--
http://www.jim.com


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



apt-get: Command not found.

2005-08-05 Thread James A. Donald
apt-get: Command not found.

I am a newbie to linux.  I recently installed Debian on a computer
that sits in a closet 

So I ssh in.  I got Samba working fine, after tinkering with the
/etc/samba/smb.conf file to read:

[global]
workgroup = workgroup
netbios name = linux
security = share
[shareRW]
path =  /home/james/Documents/sharedRW
read only = No
guest ok = Yes

and manually starting the daemons with 
nmbd -D
smbd -D

All was well

But then I wanted it to automatically start the daemons on reboot, and
I had no idea how to do that.  

So I said to myself, well, surely Debian knows how to do that, so
attempted to type

apt-get update
apt-get install samba smbclient 

Only to get the surprising message: apt-get: Command not found.

I conjecture that apt-get has been replaced with some cool gui based
configuration tool.

I recollect that when I access the computer with keyboard and monitor,
(which requires me to haul the computer out of the cupboard) I get
some stuff about updates, but when I access the KDE gui through vnc
and vncserver, I get a rather sparse screen that does not have that
update stuff on it.

I suppose there is some command I can give in the KDE gui that will
bring up some tool for updating and configuring debian?

my .vnc/xstartup file is
 unset SESSION_MANAGER
 exec /etc/X11/xinit/xinitrc
[ -x /etc/vnc/xstartup ]  exec /etc/vnc/xstartup
[ -r $HOME/.Xresources ]  xrdb $HOME/.Xresources
xsetroot -solid grey
vncconfig -iconic 
xterm -geometry 80x24+10+10 -ls -title $VNCDESKTOP Desktop 
startkde 

Maybe there is something I can add to that file so my startup screen
is a bit more helpful?

Of failing that, maybe I should know how to startup daemons in linux
on bootup?

--
http://www.jim.com


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: apt-get: Command not found.

2005-08-05 Thread James A. Donald
On Tue, 02 Aug 2005 09:30:15 +0200, James A. Donald
[EMAIL PROTECTED] wrote:

 apt-get: Command not found.

Sorry.

User error:  Wrong version of linux.



--
http://www.jim.com


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: apt-get: Command not found.

2005-08-05 Thread James A. Donald
On Tue, 02 Aug 2005 10:20:13 +0200, Jochen Schulz
[EMAIL PROTECTED] wrote:

 James A. Donald:
 
  apt-get: Command not found.
 
 Very strange. apt-get is not deprecated and it should be in /usr/bin.

This was my error, and for some reason I am unable to post my
retraction to the newsgroup.  I keep posting, and it just does not
appear

The problem was glaringly obvious - the box was running Suse - not
debian - and of course no apt-get on Suse.


--
http://www.jim.com


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: apt-get: Command not found.

2005-08-05 Thread James A. Donald


Date sent:  Fri, 5 Aug 2005 18:42:46 -0500
From:   Grant Thomas [EMAIL PROTECTED]
Send reply to:  Grant Thomas [EMAIL PROTECTED]
To: James A. Donald [EMAIL PROTECTED]
Subject:Re: apt-get: Command not found.
Copies to:  debian-user@lists.debian.org

  On my system, testing, 2.6.11-1-686 kernel I am able to type the following:
 locate apt-get
 
 this will search the root drive with the permissions of whomever is logged in,
 and display the results at the command line.

On Tue, 02 Aug 2005 10:20:13 +0200, Jochen Schulz [EMAIL PROTECTED] wrote:

 James A. Donald:
 
  apt-get: Command not found.
 
 Very strange. apt-get is not deprecated and it should be in /usr/bin.

This was my error, and for some reason I am unable to post my retraction to the 
newsgroup.  I keep posting, and it just does not appear

The problem was glaringly obvious - the box was running Suse - not debian - and 
of course no apt-get on Suse.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



apt-get: Command not found.

2005-08-02 Thread James A. Donald
apt-get: Command not found.

I am a newbie to linux.  I recently installed Debian on a computer
that sits in a closet 

So I ssh in.  I got Samba working fine, after tinkering with the
/etc/samba/smb.conf file to read:

[global]
workgroup = workgroup
netbios name = linux
security = share
[shareRW]
path =  /home/james/Documents/sharedRW
read only = No
guest ok = Yes

and manually starting the daemons with 
nmbd -D
smbd -D

All was well

But then I wanted it to automatically start the daemons on reboot, and
I had no idea how to do that.  

So I said to myself, well, surely Debian knows how to do that, so
attempted to type

apt-get update
apt-get install samba smbclient 

Only to get the surprising message: apt-get: Command not found.

(Which might be a good thing, for all I know this is a really stupid
way to install the daemons to be launched on startup.

I conjecture that apt-get has been replaced with some cool gui based
configuration tool, and apt-get is no longer on the path.

I recollect that when I access the computer with keyboard and monitor,
(which requires me to haul the computer out of the cupboard) I get
some stuff about updates, but when I access the KDE gui through vnc
and vncserver, I get a rather sparse screen that does not have that
update stuff on it.

I suppose there is some command I can give in the KDE gui that will
bring up some tool for updating and configuring debian or enable
apt-get?   But I may have  bring up the real kdegui, instead of the
curiously limited one I get from VNC server

my .vnc/xstartup file is
 unset SESSION_MANAGER
 exec /etc/X11/xinit/xinitrc
[ -x /etc/vnc/xstartup ]  exec /etc/vnc/xstartup
[ -r $HOME/.Xresources ]  xrdb $HOME/.Xresources
xsetroot -solid grey
vncconfig -iconic 
xterm -geometry 80x24+10+10 -ls -title $VNCDESKTOP Desktop 
startkde 

Maybe there is something I can add to that file so my startup screen
is a bit more helpful?

Of failing that, maybe I should know how to startup daemons in linux
on bootup?

--
http://www.jim.com


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED] 
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]