version control - Files in git showing as not staged after previously staging and committing files -

-

i have staged , committed handful of files locally git repo. in line remote repo, after performed git commit done git status , expecting see 1 commit ahead of repo.

however, found of files changed have found still marked modified , once again outside of staging area.

i committed new untracked files in commit. files not listed changed, must have been committed successfully.

what don't understand why these other files showing changed/unstaged again?

i using git 1.8.2.1.

what find confusing when git add -a , add files again , commit does recognise them. why take 2 commits desired result?

this output terminal when firstly git status, git commit , git status see am:

# on branch crmpicco-1872 # branch ahead of 'origin/crmpicco-1872' 3 commits. #   (use "git push" publish local commits) # # changes committed: #   (use "git reset head <file>..." unstage) # #       modified:   sass/iphone/page/sun.scss #       modified:   web/load/sun.inc.php #       modified:   web/content/iphone/sun.inc.php #       modified:   web/css/compressed/iphone/checkout.css #       modified:   web/css/compressed/iphone/style.css #       modified:   web/scripts/iphone/js/iphone.js #       modified:   web/scripts/jquery_mobile/swipe/swipe.jquery.js  git commit -m 'my commit message in here'  [crmpicco-1872 5f248ca] commit message in here  4 files changed, 45 insertions(+), 54 deletions(-)  git status  # branch ahead of 'origin/crmpicco-1872' 4 commits. #   (use "git push" publish local commits) # # changes not staged commit: #   (use "git add <file>..." update committed) #   (use "git checkout -- <file>..." discard changes in working directory) # #       modified:   web/content/iphone/sun.inc.php #       modified:   web/css/compressed/iphone/checkout.css #       modified:   web/css/compressed/iphone/style.css

edit: here screenshot of happening right (again).

enter image description here


Comments

Post a Comment

Popular posts from this blog

java - activate/deactivate sonar maven plugin by profile? -

-
i use sonar plugin executes if activated in maven profile. sonar runs on every compile. the problem build fail other team members not have sonar application installed locally. pom.xml checked in team members same copy including sonar configuration, don't want them modify purpose of disabling sonar (they might inadvertently check modified copy in). please advise how configure maven (.m2/settings.xml) and/or pom.xml sonar feature can enabled/disabled local profile. here sonar configuration in each project's pom.xml: <plugin> <groupid>org.codehaus.mojo</groupid> <artifactid>sonar-maven-plugin</artifactid> <version>1.0</version> <executions> <execution> <id>make-sonar</id> <phase>compile</phase> <goals> <goal>sonar</goal> </goals> </execution> </executions> ...
Read more

python - TypeError: can only concatenate tuple (not "float") to tuple -

-
i'm new python, question might easy, anyway, patience: as trying call newton-raphson method calculate implied volatility in black-scholes formula call/put option pricing, first thing is, newton method in scipy.optimize seems calculate function's zeros, in black-scholes formula, want function's value option price, not zero. (i'm new here programming, i'm not sure techniques.) should write function things like: def f(sigma, price): return bsformula(s0,k,r,t,q,sigma) - price then, while calling newton method, takes args=() 1 parameter in function, write this: value = newton(bsprice2, 0.5, args=price) but error message: file "bs.py", line 36, in bsimpvol value = newton(bsprice2, 0.5, args=float(price)) file "/usr/lib/python2.7/dist-packages/scipy/optimize/zeros.py", line 143, in newton q0 = func(*((p0,) + args)) typeerror: can concatenate tuple (not "float") tuple could tell me why that? how fix it? apprecia...
Read more

java - What is the difference between String. and String.this. ? -

-
this question has answer here: meaning of .this , .class in java 2 answers i'll straight point. im still learning bit of syntax , want know difference between code is code a: public class buttonz extends jbutton{ public buttonz(){ settext(new string(string.valueof(i))); } } please ignore fact i undeclared, not lost. code b: public class buttonz extends jbutton{ public buttonz(){ settext(new string(string.this.charat(i))); } } what don't yet understand difference in typing string.this , string. i under assumption when use dot operator on class accessing it's static methods(and/or variables if they're not hidden). i have studied little bit , have concluded when using string. accessing string static methods.. when using string.this. i'm accessing methods class buttonz extendi...
Read more