Messages in this thread | | | Date | Tue, 25 Sep 2012 16:22:42 +0800 | Subject | git pull question | From | Zhi-zhou Zhang <> |
| |
Hi all,
Today I update my kernel with git pull. Then a ploblem confused me. I got the below message with git status. I excuted git checkout master -f and git reset --hard master. The ploblem is still there. So anyone please help me to find what's the matter?
# On branch 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: include/linux/netfilter/xt_connmark.h # modified: include/linux/netfilter/xt_dscp.h # modified: include/linux/netfilter/xt_mark.h # modified: include/linux/netfilter/xt_rateest.h # modified: include/linux/netfilter/xt_tcpmss.h # modified: include/linux/netfilter_ipv4/ipt_ecn.h # modified: include/linux/netfilter_ipv4/ipt_ttl.h # modified: include/linux/netfilter_ipv6/ip6t_hl.h # modified: net/netfilter/xt_dscp.c # modified: net/netfilter/xt_hl.c # modified: net/netfilter/xt_rateest.c # modified: net/netfilter/xt_tcpmss.c # no changes added to commit (use "git add" and/or "git commit -a")
-- Regards, Zhizhou Zhang
| |