| Re: can't get includes to load [message #180943 is a reply to message #180941] |
Thu, 28 March 2013 07:41   |
Cal Dershowitz
Messages: 36
Registered: February 2013
Karma:
|
Member |
|
|
On 03/28/2013 12:17 AM, Cal Dershowitz wrote:
> On 03/27/2013 03:00 AM, J.O. Aho wrote:
snip
> Now did it take a snapshot all the way up the directory tree?
>
> The directories there with url-sounding names were the results of wget
> commands. I don't need them anymore. How would I go about deleting
> them and them bringing them back to life with git just for practice?
>> I would ditch the php2, no use of it, all work you do should origin from
>> what you have live. Don't forget to create a new branch when you start
>> to work with something, when you put something live, you merge that
>> branch to master branch. So master should always be what you have in
>> live, other branches are for what you are working on or testing.
>>
>
> I understand somewhat and simply need to practice. Thanks for your
> very-useful comments.
I tried to do what falf did in the tutorial, but I seem not to get at
all what files git is working on. Where does the resulting "git-file"
end up?
$ pwd
/home/sites/migrate/php/php1
$ ls
includes index.php readme.txt readme.txt~ style.css
$ git add readme.txt
$ git status
# On branch master
#
# Initial commit
#
# Changes to be committed:
# (use "git rm --cached <file>..." to unstage)
#
# new file: readme.txt
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ../../../.jonathan.txt.swp
# ../../../j2.txt
# ../../../jonathan.txt
# ../../bash3.sh
# ../../cleaning/
# ../../cp_1.pl
# ../../dog/
# ../../food/
# ../../fredify2.sh
# ../../git1.txt
# ../../git1.txt~
# ../../includes/
# ../../index.php
# ../../melancholia/
# ../../micah/
# ../../migrate_ftp1.pl
# ../../music1.pl
# ../../music2.pl
# ../../nikon_bash1.sh
# ../../nikon_bash2.sh
# ../../nikon_bash3.sh
# ../../nikon_bash4.sh
# includes/
# index.php
# readme.txt~
# style.css
# ../../php1.sh
# ../../phpini.sh
# ../../reg1.pl
# ../../reg2.pl
# ../../reg2.pl.bak
# ../../sos/
# ../../style.css
# ../../variables/
# ../../../www.nmlutherhaven.com/
# ../../../www.sttimschurch.net/
$
So what now? Since this
/home/sites/migrate/php/php1
is the directory I *really* want to have this capability in, should I
do the git init there?
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.
--
Cal
|
|
|
|
Calendar
Search
Help
Members
Register
Login
Home
]