[SOLVED] GIT

Everything that has to do with the forum on a technical level. Logins, posts, formatting ...
Octal450
Posts: 2192
Joined: Sun Oct 18, 2015 2:47 am

[SOLVED] GIT

Postby Octal450 » Fri Oct 23, 2015 2:21 am

GIT noob here, I was working on the 727 and need a complete guide for how to use GIT. I created account on GIThub, forked the project, and installed GIT for Windows. My OS is Windows 7 Ultimate 64bit. A little help??? :D

User avatar
IAHM-COL
Posts: 6409
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: GIT

Postby IAHM-COL » Fri Oct 23, 2015 6:25 am

Great Job so far it0uchpods

Next step is cloning.


In git, cloning has the same exact meaning as in english. It is going to create an "identical" copy of the repository content, to a new location. You end up, basically, with several copies, each of then a complete copy of the repository. In the case of the 727 you can see, IAHM-COL has a clone, you, and a few others, and off course FGMEMBERS. All those clones you see are Remote clones, hosted on github. But we can't commit remotely. We commit to a local copy. And thus, you will create that local copy, somewhere in each of our computers.

you do that simply with the formula

Code: Select all

git clone [git-repository-address] <newClone-path/name>


Where address can be any location for other repository, either a path in your hard drive, or an url for a remote repository, and in the example above is in brackets, because it is not optional part of your command

and where newClone-name is an optional (thus the <>) name you assign to your new repository, locally stored

So basically, you can open your git shell, change to the directory of choice with cd, and then there, clone your 727-230 repository locally (you clone yours, because that is the one you have push and pull permissions, that is you can read and write to)

Code: Select all

git clone https://github.com/it0uchpods/727-230.git




Modifying your local repository and verifying status


An important git command to be familiar with is

Code: Select all

git status


Its output is always a life savior

It will tell you where your local repository stand to the attached remote repository. In the most common set up, this remote repository has an alias, "origin", and after you clone as above, origin, obviously will be it0uchpods 727 repo in github.

If the output is that you have the same content, then you do.

Sometimes it will tell you the remote is ahead, and sometime local is ahead. Or eventually... both.

The measures to take will depend on that answer :D

Now that you have a local repository, and its status indicate it is identical it is a good time to implement your changes. Introduce any change to the 727-230 that you deem appropriate, and that you deem of your interest.

Keep in mind, you are not modifying anyone else copy of the 727-230 just yet, so feel free, and accomodate your own like. you are in fact making your own version of the 727-230. Later you will share with us your changes, and we will either like them or not, take them or not, but regardless, that does not take away of you that in your own house (your repo) you are the King and only voice.

Once you have made some changes to your repo, and you are ready to share these, I suggest you do check status again. It's the safe method to verify your every step, and basically make a learn behavior to do check

Code: Select all

git status


frequently.


Once you are ready to commit your changes, let me know.[See footnote] Let me know if you cloned succesfully and whether you are getting the output of git status and the "gist" of it :D

Then, I will guide you thru your first commit, and how to push it to your repository.

[footnote]: Do not get greedy on here. Commits are really better when they are small logical steps, than when they are monstruous big achievements. I recommend you consider committing little units of changes. Example, lets say you installed the new HSI correctly, you could commit that change as "New HSI ready" or "New HSI installed". Those small commits make for better history than a commit that look like "This are thousand of bundled changes that make for the next version of this plane!"
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

Octal450
Posts: 2192
Joined: Sun Oct 18, 2015 2:47 am

Re: GIT

Postby Octal450 » Fri Oct 23, 2015 2:13 pm

-
Last edited by Octal450 on Mon Aug 07, 2023 9:49 pm, edited 1 time in total.

User avatar
IAHM-COL
Posts: 6409
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: GIT

Postby IAHM-COL » Fri Oct 23, 2015 2:39 pm

Enter the repo first

Code: Select all

cd 727-230
git status
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

User avatar
IAHM-COL
Posts: 6409
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: GIT

Postby IAHM-COL » Fri Oct 23, 2015 3:14 pm

it0uchpods wrote:
I am ready to learn to push, I will put the modified files into the 727-230 folder.


Staging changes

OK.

you actually don't pull or push files. You pull or push commits. Commits are like steps on the development ladder. they contain information on the whole status of your repo. Once, Linus Torvalds said. Git does not track files. It tracks commits. It tracks repositories (or something of that sort)

you can modify the content of your directory all you want, but until you commit, you are not making your repository track those changes quite yet. It is aware of them, but it just don't take them into account. They are in what is called as unstaged status.

So, once you have your changes, as you said in the 727 thread, you can do (again)

Code: Select all

git status


and you will see that your new files, and the files you changed content are indicated in red (or a certain color, it just happen to be red in my terminal), and it probably says, changes unstaged and then the list follows.

Unstaged means, those changes are there, but they are not queued for commit.

The command git add, does the staging process. You can add anything you want, and prepare for the following commit. You can add changes to a file, to a directory (and all subdirs), or you add (stage) every unstaged changes in that repository. The easy, fast, expedite way is to add all and commit once, but sometimes, you want to split your changes in individual smaller commits.

The usage is simple and obvious

Code: Select all

git add <filename>


Code: Select all

git add <dirname>


for their respective usage

and

Code: Select all

git add .  #there is a dot at the end of the command that reads as "here"


to add the current directory, or

Code: Select all

git add --all


For staging all changes on one simple shot. .

For beginners, I like the last one, because it is bullet proof, and I recommend to begin there, and explore the variants later.

After staging (adding), check the status again

Code: Select all

git status


You will see the unstaged files, list now on a new category, that says "staged for commit". In my terminal the list is now green-colored too, to make an easy read of the info.


Committing

the command git commit does the most important git job. Creates the commit. It commits anything that is staged on the moment of the command. It commits on your current branch, which by default is aliased "master".

the command is, as you would expect

Code: Select all

git commit


This opens a text editor. Where you HAVE to create a commit message. If you exit the text editor with no message (only with lines beginning with # -- comments) then the commit aborts. Great trick if you think twice about committing that.

The message contains a first line, the title. Then an empty line, and then a body text message. The title is required. The body text is an advised clarification on what you were thinking, and a list of changes. It's up to you. But consider that: i) a concise, clear and explanatory title is preferable, and ii) a verbose, explanatory message body text is greatly appreciated.

Once you are done editing your message. save the file. Exit the editor. That finishes the commit.

A variant of git commit is of the form

Code: Select all

git commit -m "commit title"


That goes faster because it avoids the text editor steps. And commits expeditely with the title indicated by the flag -m


Verifying your job


another command that's quite useful is git log. Git log, lists the commits on the repo, from now (top) to repo inception (bottom).

Code: Select all

git log


You should be able to see that (a) new commit(s) now exist in the log. They are time-stamped, and they indicate YOU as author.

Code: Select all

git status

(make of this one really a OCD behavior!)

your new status will indicate now that commits exist in your local that do not exist in your remote! That is, you can push.
(you push and pull commits, I said)

When you work with collaborators, they could have pushed commits to the repo while you did your part of the deal, so eventually your git status may tell you remote have commits you do not yet.

After committing, and verifying, you are ready to push.
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

User avatar
IAHM-COL
Posts: 6409
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: GIT

Postby IAHM-COL » Fri Oct 23, 2015 3:24 pm

Pulling and Pushing

Pulling and pushing are your ways to interact with the remote repository. Pull brings new commits from remote to your local. Push does the opposite, it sends commits from local to remote.

they have the form

Code: Select all

git pull <repository-alias> <branchname>


and

Code: Select all

git push <repository-alias> <branchname>


where repository alias its a short name for another repository, but it can be replaced by full paths to the repository (in your disc), or by an url, as needed. The default value is "origin", which means, the alias of the remote url you cloned from.
and where branchname is the branch you want to pull or push, and in the first steps it will be the default branch, named as "master".

So, commonly

You pull by doing

Code: Select all

git pull origin master


or since origin, and master are defaults, you can simply do

Code: Select all

git pull


ALWAYS pull before push

Just make that your second nature. It is the only safe way to go, and the only way to collaborate appropriately with other developments. Software development is social by nature, and probably others are working on your craft. So. Just pull. Even if your git status said, nothing new on the remote, and you know it will do nothing. Just a sanity check. Just the only proper etiquette. Just make this your second nature.

Pushing

Pushing does the magic of sharing your changes to the world (in your remote repository). Don't worry if your changes are "incomplete". You are still not altering/modifying the development repository of IAHM-COL. You are just updating your remote (on it0uchpods). The last step will be inviting IAHM-COL to update with your work. But about that, later.

If you already pulled, then you can go ahead and push

Code: Select all

git push origin master


I like pushing always explicitly, so to speak it avoids Doh! (facepalm) moments. this is because the defaultness of origin and master is more relative than absolute. It may depend on what branch you are working on, whether you tag them appropriately, whether you changed remote alias, etc. So... just don't., Just don't thrust origin and master as reliable alias for push purposes.
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

Octal450
Posts: 2192
Joined: Sun Oct 18, 2015 2:47 am

Re: GIT

Postby Octal450 » Fri Oct 23, 2015 6:13 pm

Right. I have done everything, but cannot commit! Here is terminal log:

it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git add --all
warning: LF will be replaced by CRLF in .gitignore.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in .gitmodules.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in 727-230-JSB-set.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in 727-230-JSB.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in 727-230-set.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in 727-230.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in 727-230ADV-JSB-set.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in 727-230ADV-JSB.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in 727-230F-JSB-set.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in 727-230F-JSB.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in COPYING.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Dialogs/SteeringDialog.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Dialogs/autopilot.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Dialogs/tiller-steering.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Engines/JT8D-17R.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Engines/JT8D-9.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Engines/direct.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Init/controls.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Init/instrumentation.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/727-230.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/727-230.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/727-230ADV.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/727-230F.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/727-230F.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/727-230W.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/727-230W.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Effects/727-230-combShaders.eff.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Effects/contrail.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Effects/reflection.eff.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Effects/wingtip-trails.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/AGLIndicator/agl-switch.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/AGLIndicator/agl-switch.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/AGLIndicator/agl.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/AGLIndicator/agl.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/ASI/asi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/ASI/asi1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Altimeter/alt.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Altimeter/alt1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Altimeter/alt2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/AttitudeDirector/adi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/AttitudeDirector/adi.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/AttitudeIndicator/ai.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/AttitudeIndicator/ai1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Clock/clock.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Clock/clock.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/DME/dme.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/DME/dme1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/DME/dme2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/epr_1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/epr_2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/epr_3.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/epr_4.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/exh_1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/exh_2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/exh_3.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/exh_4.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/ffkgh_1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/ffkgh_2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/ffkgh_3.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/ffkgh_4.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/instr_epr.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/instr_exh.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/instr_ffkgh.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/instr_n1.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/instr_n2.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/n1_1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/n1_2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/n1_3.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/n1_4.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/n2_1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/n2_2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/n2_3.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Engines/n2_4.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Flaps/Flapstack/flapstack.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Flaps/Flapstack/flapstack.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSI/hsi (copy).xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSI/hsi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSI/hsi1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Mach/mach.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/Mach/mach.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/ParkingBrake/pneubrake.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/ParkingBrake/pneubrake.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/RMI/rmi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/RMI/rmi1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/TrimIndicator/trim.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/TrimIndicator/trim.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/TurnIndicator/turn.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/TurnIndicator/turn.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/VSIndicator/vs.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/VSIndicator/vsi1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/VSIndicator/vsi2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/VSIndicator/vsi3.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/Instruments.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/STBYai/STBYai.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/STBYai/STBYai.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/ai/ai.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/ai/ai.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/alt/alt.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/alt/alt.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/alt2/alt.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/alt2/alt.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/asi/asi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/asi/asi.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/debit/debit.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/debit/debitL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/debit/debitR.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/egt/egt.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/egt/egtL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/egt/egtR.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/epr/epr.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/epr/eprL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/epr/eprM.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/epr/eprR.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/flaps/flaps.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/flaps/flaps.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/fuel/fuel.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/fuel/fuelC.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/fuel/fuelL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/fuel/fuelR.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/hsi/hsi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/hsi/hsi.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/oilpressure/oilpressure.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/oilpressure/oilpressureL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/oilpressure/oilpressureM.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/oilpressure/oilpressureR.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/oiltemp/oiltemp.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/oiltemp/oiltempL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/oiltemp/oiltempM.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/oiltemp/oiltempR.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/rpm/rpmN1.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/rpm/rpmN1L.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/rpm/rpmN1M.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/rpm/rpmN1R.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/rpm/rpmN2.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/rpm/rpmN2L.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/rpm/rpmN2M.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/rpm/rpmN2R.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/vsi/vsi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/OLD/vsi/vsi.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/CircuitBreakers/circuitBreaker.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/CircuitBreakers/circuitBreaker.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/LightSwitches/flightdecklights.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/LightSwitches/flightdecklights.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/LightSwitches/landinglights.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/LightSwitches/landinglights.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/LightSwitches/outerlights.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/LightSwitches/outerlights.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/SeatBeltSwitch/SeatBeltSwitch.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/SeatBeltSwitch/SeatBeltSwitch.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/WiperSwitches/wiperswitch.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/WiperSwitches/wiperswitch.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/magnetic-compass/magnetic-compass1.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Overhead/magnetic-compass/magnetic-compass1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/cockpit/727-230-Cockpit.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/flightdeck.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/AP1/AP1.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/AP1/AP1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/adf-radio/adf.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/adf-radio/adf1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/adf-radio/adf2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/clock.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/clock.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/comm/comm.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/comm/comm1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/comm/comm2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/dir-gyro.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/dme/dme.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/dme/dme.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/dme/ki266.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/dme/ki266.svg.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/dme/ki266.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/hdg-gauge.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/hsi/hsi-copilot.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/hsi/hsi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/hsi/hsi.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/nav-radio/nav1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/nav-radio/nav2.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/nav-radio/nav_radio.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/rmi/rmi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Instruments/rmi/rmi.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/CA.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/CCI.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/CRZ.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/DHL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/DLH.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/FDX.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/Servientrega.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/UPS.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/USATour.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/USPS.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries-OLD/WT.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/AAL-Astrojet.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/AAL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/AGX.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/AGX1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/AGX3.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/AUTHORS.txt.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/BOE.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/CCI.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/CRZ.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/DHL.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/DLH.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/JAT.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/JWocky.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/KIA.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/PAA.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/PIA.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/Servientrega.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Liveries/UAL-Rainbow.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/shadow.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/shadow.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/wireframe.svg.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Nasal/727.nas.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Nasal/Steering.nas.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Nasal/livery.nas.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Nasal/mk-ki266.nas.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Nasal/reverse-thrust.nas.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Nasal/tyresmoke.nas.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Nasal/waypoint-smoothing.nas.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Paintkit/727-230_paintkit.svg.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in README.md.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Sounds/Sounds.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/727-230-instrumentation.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/727-autopilotV5.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/SYS8_0_autopilot.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/TriCycle_PushbackJSBSIM.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/instrumentation-rules.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/steering.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Thanks.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSIOLD/hsi (copy).xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSIOLD/hsi.ac.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSIOLD/hsi1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/instrumentation.xml.
The file will have its original line endings in your working directory.

it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git status
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSI/hsi (copy).xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSI/hsi1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/steering.xml.
The file will have its original line endings in your working directory.
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: Models/Flightdeck/Dashboard/HSI/hsi (copy).xml
modified: Models/Flightdeck/Dashboard/HSI/hsi1.xml
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi (copy).xml
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi-more.png
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi.ac
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi.png
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi1.xml
new file: Models/Flightdeck/Dashboard/HSIOLD/shadow.png
new file: Systems/instrumentation.xml
modified: Systems/steering.xml


it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git commit

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident name (for <it0uchpods@Main-PC.(none)>) not allowed

it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git commit it0uchpods@github.com
error: pathspec 'it0uchpods@github.com' did not match any file(s) known to git.

it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git commit -m "HSI 3D Mapped and installed, Nose steering fixed"

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident name (for <it0uchpods@Main-PC.(none)>) not allowed

it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git status
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSI/hsi (copy).xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Models/Flightdeck/Dashboard/HSI/hsi1.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in Systems/steering.xml.
The file will have its original line endings in your working directory.
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: Models/Flightdeck/Dashboard/HSI/hsi (copy).xml
modified: Models/Flightdeck/Dashboard/HSI/hsi1.xml
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi (copy).xml
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi-more.png
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi.ac
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi.png
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi1.xml
new file: Models/Flightdeck/Dashboard/HSIOLD/shadow.png
new file: Systems/instrumentation.xml
modified: Systems/steering.xml


it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git commit

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident name (for <it0uchpods@Main-PC.(none)>) not allowed

it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git commit --global
error: unknown option `global'
usage: git commit [<options>] [--] <pathspec>...

-q, --quiet suppress summary after successful commit
-v, --verbose show diff in commit message template

Commit message options
-F, --file <file> read message from file
--author <author> override author for commit
--date <date> override date for commit
-m, --message <message>
commit message
-c, --reedit-message <commit>
reuse and edit message from specified commit
-C, --reuse-message <commit>
reuse message from specified commit
--fixup <commit> use autosquash formatted message to fixup specified commit
--squash <commit> use autosquash formatted message to squash specified commit
--reset-author the commit is authored by me now (used with -C/-c/--amend)
-s, --signoff add Signed-off-by:
-t, --template <file>
use specified template file
-e, --edit force edit of commit
--cleanup <default> how to strip spaces and #comments from message
--status include status in commit message template
-S, --gpg-sign[=<key-id>]
GPG sign commit

Commit contents options
-a, --all commit all changed files
-i, --include add specified files to index for commit
--interactive interactively add files
-p, --patch interactively add changes
-o, --only commit only specified files
-n, --no-verify bypass pre-commit hook
--dry-run show what would be committed
--short show status concisely
--branch show branch information
--porcelain machine-readable output
--long show status in long format (default)
-z, --null terminate entries with NUL
--amend amend previous commit
--no-post-rewrite bypass post-rewrite hook
-u, --untracked-files[=<mode>]
show untracked files, optional modes: all, normal, no. (Default: all)


it0uchpods@Main-PC MINGW64 ~/727-230 (master)

User avatar
IAHM-COL
Posts: 6409
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: GIT

Postby IAHM-COL » Fri Oct 23, 2015 7:32 pm

@it0uchpods

The major problem I am seeing is those Warnings

Code: Select all

The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in <somefile here>


Commiting like that will be a very very bad idea.
We need to figure out a way to fix that.

Try configuring your git with this


Code: Select all

git config --global core.autocrlf false


and then

Code: Select all

git add --all


again.

Note if these warnings go away.
Also do this before commiting...
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

User avatar
IAHM-COL
Posts: 6409
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: GIT

Postby IAHM-COL » Fri Oct 23, 2015 7:33 pm

About committing

Git is telling you what's needed.

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"


So you need to do these, to identify yourself (once)

Code: Select all

git config --global user.email "you@example.com"
git config --global user.name "Your Name"
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

Octal450
Posts: 2192
Joined: Sun Oct 18, 2015 2:47 am

Re: GIT

Postby Octal450 » Fri Oct 23, 2015 11:43 pm

-
Last edited by Octal450 on Mon Aug 07, 2023 9:49 pm, edited 2 times in total.


Return to “Technical Questions”

Who is online

Users browsing this forum: No registered users and 6 guests