git diff - Some doubts about how correctly compare the staging area content with the last commit using GIT? -

-

i pretty new in git , have following doubt correct use of git diff --staged should compare staging area content last commit.

so obtain output:

$ git diff --staged diff --git a/game.js b/game.js index 49bf5ea..0783175 100644 --- a/game.js +++ b/game.js @@ -421,6 +421,7 @@ ship = function () {      }      if (key_status.space) {        if (this.delaybeforebullet <= 0) { +               this.delaybeforebullet = 10;         // added fix bug !!!          (var = 0; < this.bullets.length; i++) {            if (!this.bullets[i].visible) {              sfx.laser(); @@ -539,6 +540,7 @@ bigalien = function () {       this.delaybeforebullet -= delta;      if (this.delaybeforebullet <= 0) { +       //if (this.delaybeforebullet = 10) {        this.delaybeforebullet = 22;        (var = 0; < this.bullets.length; i++) {          if (!this.bullets[i].visible) {  andrea@andrea-pc mingw64 ~/documents/ws_vari/version-control/asteroids ((3884eab ...))

so means output? think means that, in staging area have add these 2 lines:

1)

 + this.delaybeforebullet = 10; // added fix bug !!!

2) 

+       //if (this.delaybeforebullet = 10) {

that don't have in last commit.

is reasoning correct?

yes, it's more accurate in staging-area, have version of file has 2 lines.

the staging-area contains complete files, not differences other files. has complete copies of other files well; they're identical versions of files in head commit, git diff doesn't show them.


Comments

Post a Comment

Popular posts from this blog

magento2 - Magento 2 admin grid add filter to collection -

-
i created grid in admin xml ui components. need filter collection via url parameter , dont know how achieve that. tried inject requestinterface collection, filter didnt work. di.xml <virtualtype name="slidelistingdataprovider" type="magento\framework\view\element\uicomponent\dataprovider\dataprovider"> <arguments> <argument name="collection" xsi:type="object" shared="false">xxx\xxx\model\resourcemodel\grid\slide\collection</argument> <argument name="filterpool" xsi:type="object" shared="false">slidelistingfilterpool</argument> <!-- define new object filters --> </arguments> </virtualtype> <virtualtype name="slidelistingfilterpool" type="magento\framework\view\element\uicomponent\dataprovider\filterpool"> <arguments> <argument name="applier...
Read more

Android volley - avoid multiple requests of the same kind to the server? -

-
i using volley upload list of images server. happens within service. once image uploaded remove list. problem arises when internet connection breaks. when internet connection breaks , comes again thinking of adding images yet uploaded request queue. this can result in more 1 copy of same image saved on server request same image might have gone through before getting rseponse. how can address scenario? i'm not quite sure why you're using service schedule requests volley automatically runs it's request in seperate thread. nevertheless can listen both request results, successful , unsuccessful adding listeners. you can remove image list schedule request using volley. if succeeds can carry on desired, if fails can add again list. public static request getimageuploadrequest(final string image) { response.listener<t> responselistener = new response.listener<t>() { @override public void onresponse(t response...
Read more

Combining PHP Registration and Login into one class with multiple functions in one PHP file -

-
i'm trying combine registration, activation , login scripts php website backend script front end developer can pass variables different forms to. my question whether appropriate approach this. don't want have lot of php files different pieces of application developing. far have written following 2 functions login, register , activate user front end developer can call: <?php /** * created phpstorm. * user: karl * date: 26/07/2016 * time: 02:25 */ class users { function register_user($email, $password, $user_name) { $server_name = "localhost"; $u_name = "root"; $db_password = "root"; $db_name = "betamath_graspe"; //email notification variable $from_address="info@slack.com"; //registration form $msg_reg_user='username taken. please choose different username'; $msg_reg_email='email registered'; $msg_reg_active=...
Read more