On Sun, November 7, 2010 19:03, Andreas Gohr wrote: > Hi *, > Hi Andreas! > a bit late for the October release, but it's finally done. DokuWiki > 2010-11-07 "Anteater" is available for download from the usual place. > I just tried to update my installation by using git: # git status # On branch stable # Untracked files: # (use "git add <file>..." to include in what will be committed) # # lib/images/smileys/accept.png # lib/images/smileys/cancel.png # lib/images/smileys/heart.png # lib/images/smileys/thumb_down.png # lib/images/smileys/thumb_up.png # lib/images/smileys/tick.png nothing added to commit but untracked files present (use "git add" to track) # git pull From git://github.com/splitbrain/dokuwiki ! [rejected] stable -> stable (non fast forward) What am I doing wrong? -- Thomas Kindler <mail+dw@xxxxxxxxxxxx> -- DokuWiki mailing list - more info at http://www.dokuwiki.org/mailinglist