On Fri, 15 Aug 2014 07:06:51 -0700 (PDT)
Etienne Pouliot <etiennepoul...@gmail.com> wrote:
> I'm trying to get my post-merge hook to run but I can't get it to
> #git pull
> remote: Counting objects: 5, done.
> remote: Compressing objects: 100% (4/4), done.
> remote: Total 4 (delta 2), reused 0 (delta 0)
> Unpacking objects: 100% (4/4), done.
> From /srv/git/salt/
> 33986c4..2ed0fc3 master -> origin/master
> First, rewinding head to replay your work on top of it...
> Fast-forwarded master to 2ed0fc36cfecf48857bd7ed101e0c3690d35dd22.
The merge did not happen because `git merge` (which was run as a
part of the `git pull` work flow) performed a fast-forward.
Note that fast-forwarding is not merging because it's just updating a
reference (the branch "master" in your case). Hence true merging
happens only when you're coercing two lines of history each of which
having a number of commits based on the common ancestor of these
branches. To put it another way, fast-forwarding happens if the line
of history to be merged completely contains the line of history it's
being merged into.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.