diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-10 13:37:22 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-06-10 18:13:25 -0700 |
commit | 1379f3479278b4a7c6de1ada9e21161d2117c210 (patch) | |
tree | 75298c05b98ad6820543880b4fd5b6a51a59ef97 /qt-ui/webservices.ui | |
parent | ec8ba5f830efc01f2db627e82e34c353c0dd13f7 (diff) | |
download | subsurface-1379f3479278b4a7c6de1ada9e21161d2117c210.tar.gz |
git storage: actually update cached copy from remote
We used to fetch the remote information but not actually do anything
about it, except report when it wasn't up-to-date.
Now we actually update the local cached copy if the remote has changed.
The code does not try to actually merge things, so only fast-forward
updates are done, but that should be the normal case. We might
eventually do some simple merging on our own, but I suspect manual
merging may be the safer option.
We don't currently ever update the remote repository, and only inform
users that our local repository is ahead of the remote. Fixing that is
the next step.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/webservices.ui')
0 files changed, 0 insertions, 0 deletions