"forced update"

[Andrew Sackville-West]

On Sun, Aug 12, 2012 at 09:13:37PM +0000, Sean Whitton wrote:
> What does it mean when git says "forced update" after a pull?
[...]
> mr update: /home/swhitton/var
> From /mnt/gitcrypt/var
>  + 3c4a314...e58bcd9 git-annex  -> origin/git-annex  (forced update)
>  + 805d6cc...8fc53c5 master     -> origin/master  (forced update)
> Already up-to-date.
> merge . ok

in my experience it's the result of fetching a branch that has been
rebased or rewritten. Normally a fetch will just grab the new commits
on a particular branch. But if the sha1s have changed because history
has changed, git warns you by calling out the forced update.

hth,

A
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.madduck.net/pipermail/vcs-home/attachments/20120814/8920cd42/attachment.pgp>