Re: "forced update"
Thank you for your reply. But I haven't done any rebasing or rewriting. Could git-annex have done something like this by mistake--a bug? Sean ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
Re: "forced update"
On Sun, Aug 12, 2012 at 09:13:37PM +, 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 signature.asc Description: Digital signature ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
"forced update"
What does it mean when git says "forced update" after a pull? I have never seen this before and, since I am the only person committing to my git-annex repository, can't think of any reason why git-annex would do this, based on Googling for "forced update". Any input appreciated. 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 [immediately afterwards] mr push: /home/swhitton/var Counting objects: 1125, done. Delta compression using up to 2 threads. Compressing objects: 100% (714/714), done. Writing objects: 100% (771/771), 70.09 KiB | 5 KiB/s, done. Total 771 (delta 371), reused 0 (delta 0) To /mnt/gitcrypt/var.git e58bcd9..d92343d git-annex -> git-annex 8fc53c5..5da9d86 master -> master Thanks. Sean ___ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
