On Wed, Feb 9, 2011 at 7:49 PM, Andy Ross wrote:
> On 02/09/2011 12:02 AM, Tim Moore wrote:
> > "Backing out" is done with git reset --hard last_good_commit. Often the
> name of the last good commit is HEAD^, the last commit. However, after a
> botched merge it is good to verify that with git log
What I did was run a "git merge" when I really wanted to do a "git
cherry-pick". The merge merged everything in my test branch, and I just
wanted the one single commit moved over. I haven't done enough of this yet
to have remembered the difference. Most of the time (but not always) git
seems to
On 02/09/2011 12:02 AM, Tim Moore wrote:
> "Backing out" is done with git reset --hard last_good_commit. Often the name
> of the last good commit is HEAD^, the last commit. However, after a botched
> merge it is good to verify that with git log or graphically with gitk.
Actually, unless I've mis
On 02/08/2011 11:04 AM, Anders Gidenstam wrote:
> Backing it out might be a bit tricky, but you can rename your messed up
> branch out of the way easily with git branch -m oldname newname.
It's worth experimenting with "git reflog" in situations like this.
That tracks a list of HEAD references in
"Backing out" is done with git reset --hard last_good_commit. Often the name
of the last good commit is HEAD^, the last commit. However, after a botched
merge it is good to verify that with git log or graphically with gitk.
If you've pushed a commit to a public repo and then it later turns out tha
On Tue, 8 Feb 2011, Curtis Olson wrote:
> I made a commit into a branch of a --local clone of my fgdata repository. I
> pushed that to the matching branch in my main fgdata.git repository.
>
> Then I attempted to merge one commit into the master branch ... however it
> merged *all* my changes.
>
I made a commit into a branch of a --local clone of my fgdata repository. I
pushed that to the matching branch in my main fgdata.git repository.
Then I attempted to merge one commit into the master branch ... however it
merged *all* my changes.
How can I back this out (I've made some hacks to so
7 matches
Mail list logo
