On Jan 22, 2010, at 1:44 AM, Peter Stuge wrote:
>>> In that case you can git pull --rebase and after that
>>> would you only be a single commit ahead? If you only need to change
>>> the very latest commit in your repo then things are very simple, just
>>> change files, git add them, then git commit --amend
>>> Or do you need to change an older commit?
>> I have since committed a fix to the context strings in libssh_debug().
> Okey. Then you need to checkout the authfix commit, amend it, and
> finally rebase the debugstring fix onto the amended authfix commit.
> One way is with branches:
> git branch debugstrings
> git checkout -b authfix theauthfixcommitid
> change files
> git add files
> git commit --amend
> git rebase authfix debugstrings
> git branch -D master
> git checkout -b master debugstrings
> git branch -d authfix debugstrings
> (Read git-branch and git-rebase man pages for descriptions, or ask.)
I think I have it now (there was only one instance of LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED in the code and one in the man page). It's attached, please let me know if this is ok.
Received on 2010-01-22