Re: VC mode and git

[Yuri Khan]

On Sun, Apr 5, 2015 at 6:43 PM, Harald Hanche-Olsen <address@hidden> wrote:

> git diff f1cea3e dca743f | patch -p1
>
> (Though I think git has better builtin commands than the above pipeline into
> patch; I just don't know them.)

This is spelled “git cherry-pick f1cea3e..dca743f”, although it will
also put you into conflict resolution mode if conflicts occur.

> git reset --hard origin/master
> git pull
> git diff f1cea3e dca743f | patch -p1
> # edit lisp/Changelog
> git commit -a

This is roughly equivalent to fetching and then rebasing the branch
containing f1cea3e..dca743f onto origin/master. (If f1cea3e and
dca743f are more than one commit apart, your recipe would combine them
into a single commit. To achieve the same effect in Git, one uses “git
rebase --interactive” with the “squash” or “fixup” action.)