git - Untracked and changed files are the same -

-

how can git tell me has changed if it's not tracked? , how can deleted, when it's discovered untracked?:

$ git status on branch updated-code-foundation branch ahead of 'origin/updated-code-foundation' 16 commits.   (use "git push" publish local commits) changes committed:   (use "git reset head <file>..." unstage)      deleted:    component/portal/src/joppli/acl/aclinterface.php     deleted:    container/php-apache/config/apache/default.conf     deleted:    container/php-apache/config/php/php.ini  untracked files:   (use "git add <file>..." include in committed)      component/portal/src/joppli/acl/aclinterface.php     container/php-apache/config/

i solve git add . ( no commit needed... )

  1. why occurring?
  2. how can prevent occurring?

1. scenario following:

  • you have file tracked , committed repository
  • you git rm file
  • file created again

example:

git add myfile git commit -m "myfile" git rm myfile echo test > myfile git status  changes committed:   (use "git reset head <file>..." unstage)      deleted:    myfile  untracked files:   (use "git add <file>..." include in committed)      myfile

2. not sure how prevent it, depends on files. files auto generated , committed them mistake, , tried erase them.

possibly belong in .gitignore?


Comments

Post a Comment

Popular posts from this blog

ruby - Trying to change last to "x"s to 23 -

-
i have been playing around irb , have string looks this: irb(main):072:0> puts ["[\"4354 5432 5432 xxxxx\", \"6547 6547 8543 xxxxx\", \"2344 6543 6674 xxxxx\", \"2346 6236 7543 xxxxx\", \"1273 5585 5587 xxxxx\"]"] => nil irb(main):073:0> what want gsub last 2 "x" s of each 17 digit combination, 23 . what i've tried far (i've been using rubular): a.gsub(/\d[x]/,"23") <= grabs "x" s i'm close a.gsub(/\w[x{2}]/,"23") <= grabs "x" s grabs two digits each combination. is there easier way i'm not understanding? a.gsub(/\d{4} \d{4} \d{4} xxx\kxx/, '23') \d{4} = 4 digits what \k drop matched far. can use don't replace entire number, still able validate have in desired format.
Read more

jquery - Clone last and append item to closest class -

-
this bare-bones code on page: <div class="list-container"> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> </div> <p><button class="add-list-item">add</button></p> <div class="list-container"> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> </div> <p><button class="add-list-item">add</button></p> <di
Read more

c - Unrecognised emulation mode: elf_i386 on MinGW32 -

-
i'm trying make kernel, , cannot link c output assembly. ld . i'm getting error: unrecognized emulation mode: elf_i386 i'm using windows 10 professional mingw32 , msys. code using: link.ld /* * link.ld */ output_format(elf32-i386) entry(start) sections { . = 0x100000; .text : { *(.text) } .data : { *(.data) } .bss : { *(.bss) } } kernel.c /* * kernel.c */ void kmain(void) { const char *str = "my first kernel"; char *vidptr = (char*)0xb8000; //video mem begins here. unsigned int = 0; unsigned int j = 0; /* loops clears screen * there 25 lines each of 80 columns; each element takes 2 bytes */ while(j < 80 * 25 * 2) { /* blank character */ vidptr[j] = ' '; /* attribute-byte - light grey on black screen */ vidptr[j+1] = 0x07; j = j + 2; } j = 0; /* loop writes string video memory */ while(str[j] != '\0') { /
Read more