emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Stash


From: Eli Zaretskii
Subject: Re: Stash
Date: Mon, 06 Apr 2015 09:55:17 +0300

> From: Steinar Bang <address@hidden>
> Date: Mon, 06 Apr 2015 08:50:15 +0200
> 
> >>>>> Richard Stallman <address@hidden>:
> 
> > I did
> 
> >> git reset --hard HEAD
> 
> > since I had installed all my changes.
> > Then I did 'git pull' and it reported a lot of things.
> > Then I did 'git status' which produced this:
> 
> >     # On branch master
> >     # Your branch is ahead of 'origin/master' by 2 commits.
> >     #
> >     nothing to commit (working directory clean)
> 
> > What does that second line "ahead of" mean?
> 
> It means that the branch master has two commits that aren't in
> origin/master (which is your local copy of what's on savannah).
> 
> > Is it a problem?
> 
> I don't think so.  I think they are probably artifacts of two of the
> pull commands done, so I think you probably won't need them.
> 
> The following is a way to remove the two commits from master in your git
> repository

Perhaps it would be better to look at those two commits first?  I
think the following command will accomplish that:

  git diff origin/master




reply via email to

[Prev in Thread] Current Thread [Next in Thread]