| Re: Git (Was: can't get includes to load) [message #180961 is a reply to message #180944] |
Fri, 29 March 2013 07:28   |
Cal Dershowitz
Messages: 36
Registered: February 2013
Karma:
|
Member |
|
|
On 03/28/2013 01:34 AM, J.O. Aho wrote:
> On 28/03/13 08:41, Cal Dershowitz wrote:
> after you run "git init" there will be a .git directory in the directory
> where you did the "git init" in.
I don't see it, and I just ran it.
> Don't have a git inside a git. Remove the /home/sites/.git first
> and then create a new git in the directory /home/sites/migrate/php/php1
>
> rm -rf /home/sites/.git
> cd /home/sites/migrate/php/php1
> git init
> git add .
> git commit -m "Initial commit for php1 which has a quite bad name"
>
> Now you would have the git for only the php1 directory. I do opt you to
> have better naming for your directories and files.
>
>
>> I do want to keep the php directory in this because of the way I process
>> images. I want to have a vacant parent directory, where I put all the
>> images and then store them in some subdirectory.
>
> git allows you to version handle images too, if you want, it's not
> limited to source files, of course a diff between two version of an
> image will not give you anything of value, just the possibility to
> revert to the old image.
>
>
I try to understand, but since I don't see a .git file in root,
apparently I don't.
$ pwd
/home/sites/migrate/php/php1
$ ls -l
total 24
-rw-r--r-- 1 fred automation 1480 Mar 29 00:06 git1.txt
-rw-r--r-- 1 fred automation 1400 Mar 29 00:02 git1.txt~
drwxr-xr-x 2 fred automation 4096 Mar 27 23:44 includes
-rw-r--r-- 1 fred automation 2208 Mar 26 14:36 index.php
-rw-r--r-- 1 fred automation 4 Mar 28 00:23 readme.txt
-rw-r--r-- 1 fred automation 0 Mar 28 00:23 readme.txt~
-rwxr-xr-x 1 fred automation 896 Mar 25 21:49 style.css
$ git init && git commit -m "initial commit"
Initialized empty Git repository in /home/sites/migrate/php/php1/.git/
# On branch master
#
# Initial commit
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# git1.txt
# git1.txt~
# includes/
# index.php
# readme.txt
# readme.txt~
# style.css
nothing added to commit but untracked files present (use "git add" to track)
$ ls -l
total 24
-rw-r--r-- 1 fred automation 1947 Mar 29 00:08 git1.txt
-rw-r--r-- 1 fred automation 1902 Mar 29 00:07 git1.txt~
drwxr-xr-x 2 fred automation 4096 Mar 27 23:44 includes
-rw-r--r-- 1 fred automation 2208 Mar 26 14:36 index.php
-rw-r--r-- 1 fred automation 4 Mar 28 00:23 readme.txt
-rw-r--r-- 1 fred automation 0 Mar 28 00:23 readme.txt~
-rwxr-xr-x 1 fred automation 896 Mar 25 21:49 style.css
$ pwd
/home/sites/migrate/php/php1
$ cat git1.txt
$ find /home/sites/migrate -name "*~" -exec rm -f {} \;
$ cd /home/sites/ && tar -cf ~/migrate.tar migrate && cd && gzip
migrate.tar
^C
$ cd /home/sites/ && tar -cf ~/migrate.tar migrate && cd && gzip
migrate.tar
^C
$ cd /home/sites/ && tar -cf ~/migrate.tar migrate && cd && gzip
migrate.tar
$ ls
Desktop examples.desktop Music Public Videos
Documents Firefox_wallpaper.png perl5 Templates
Downloads migrate.tar.gz Pictures Ubuntu One
$ pwd
/home/fred
$
$ cd /home/sites && git init && git commit -m "initial commit" -a
Initialized empty Git repository in /home/sites/.git/
# On branch master
#
# Initial commit
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .jonathan.txt.swp
# j2.txt
# jonathan.txt
# migrate/
# www.nmlutherhaven.com/
# www.sttimschurch.net/
nothing added to commit but untracked files present (use "git add" to track)
I need to start this where I can make my tool chain work. Right now that's:
$ pwd
/home/sites/migrate/php/php1
$
The previous git has been deleted. I start again. While I do this
great thing I would like to comment on how the word 'git' is a very
different for people who grew up in the Ohio valley. We regard it as a
verb, usually rendered in the imperative to a stupid tracker. Like when
you actually have to go to Lexington KY and have to speak to the natives.
$ cd /home/sites/migrate/php/php1 && git init && git commit -m "initial
commit"
$ ls -l
total 24
-rw-r--r-- 1 fred automation 1480 Mar 29 00:06 git1.txt
-rw-r--r-- 1 fred automation 1400 Mar 29 00:02 git1.txt~
drwxr-xr-x 2 fred automation 4096 Mar 27 23:44 includes
-rw-r--r-- 1 fred automation 2208 Mar 26 14:36 index.php
-rw-r--r-- 1 fred automation 4 Mar 28 00:23 readme.txt
-rw-r--r-- 1 fred automation 0 Mar 28 00:23 readme.txt~
-rwxr-xr-x 1 fred automation 896 Mar 25 21:49 style.css
$
git init && git commit -m "initial commit"
$
I know I'm a little OT here, but everyone who knows me knows that I will
tack right back through this topic, because I said I would, and I meant it.
March madness is a time for hoops holiness.
--
Cal
|
|
|
|
Calendar
Search
Help
Members
Register
Login
Home
]