Git:文件保留在修改的部分中,并且无法提交

时间:2016-06-27 06:03:03

标签: git

我有没有任何更改的文件,但会一直显示在"已修改"文件,当尝试添加它然后提交接收:no changes added to commit (use "git add" and/or "git commit -a")

文件路径:../v2.7/app/Http/Controllers/Wokbits.php

我甚至尝试在文件中进行小修改,然后提交/推送(成功),但文件返回显示在"修改"文件。

enter image description here

enter image description here

git config -l返回:

core.excludesfile=~/.gitignore
core.legacyheaders=false
core.quotepath=false
core.pager=less -r
mergetool.keepbackup=true
push.default=simple
color.ui=auto
color.interactive=auto
repack.usedeltabaseoffset=true
alias.s=status
alias.a=!git add . && git status
alias.au=!git add -u . && git status
alias.aa=!git add . && git add -u . && git status
alias.c=commit
alias.cm=commit -m
alias.ca=commit --amend
alias.ac=!git add . && git commit
alias.acm=!git add . && git commit -m
alias.l=log --graph --all --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset'
alias.ll=log --stat --abbrev-commit
alias.lg=log --color --graph --pretty=format:'%C(bold white)%h%Creset -%C(bold green)%d%Creset %s %C(bold green)(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
alias.llg=log --color --graph --pretty=format:'%C(bold white)%H %d%Creset%n%s%n%+b%C(bold blue)%an <%ae>%Creset %C(bold green)%cr (%ci)' --abbrev-commit
alias.d=diff
alias.master=checkout master
alias.spull=svn rebase
alias.spush=svn dcommit
alias.alias=!git config --list | grep 'alias\.' | sed 's/alias\.\([^=]*\)=\(.*\)/\1\     => \2/' | sort
include.path=~/.gitcinclude
include.path=.githubconfig
include.path=.gitcredential
diff.exif.textconv=exif
credential.helper=osxkeychain
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
core.precomposeunicode=true
remote.origin.url=git@git.wokcraft.com:wokcraft/API.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
mwafi:v2.6 prins$ 

运行:GIT_TRACE=true git add -v ../v2.7/app/HTTP/Controllers/Wokbits.php;echo exit status is $?;git status

mwafi:v2.6 prins$ GIT_TRACE=true git add -v ../v2.7/app/HTTP/Controllers/Wokbits.php;echo exit status is $?;git status
12:02:44.979902 git.c:348               trace: built-in: git 'add' '-v' '../v2.7/app/HTTP/Controllers/Wokbits.php'
exit status is 0
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   ../v2.7/app/Http/Controllers/Wokbits.php

no changes added to commit (use "git add" and/or "git commit -a")
mwafi:v2.6 prins$ 

0 个答案:

没有答案