lkml.org 
[lkml]   [2012]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: git pull question
On Tue, Sep 25, 2012 at 04:22:42PM +0800, Zhi-zhou Zhang wrote:
> 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")

do the following:

$ git checkout master # in case you're not on it
$ git reset --hard
$ git clean -nd # will show you which files it'll remove, check them
# before actually removing them

$ git clean -fd # remove them
$ git pull # this now should fast-forward your master branch

HTH.

--
Regards/Gruss,
Boris.


\
 
 \ /
  Last update: 2012-09-25 11:41    [W:0.038 / U:0.896 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site