diff options
| author | Philip Withnall <withnall@endlessm.com> | 2018-08-13 14:39:43 +0100 |
|---|---|---|
| committer | Philip Withnall <withnall@endlessm.com> | 2018-08-13 14:39:54 +0100 |
| commit | 8578acafd519448f38601026a58dbfdbeb03a72f (patch) | |
| tree | 256fb62296a199d43d5b16f23d094898342e9d9d /gvdb | |
| parent | 4f9b4345eb36098bb10627fc3c32cbc7d6f6ff78 (diff) | |
| download | dconf-8578acafd519448f38601026a58dbfdbeb03a72f.tar.gz | |
docs: Update gvdb merge documentation
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Reviewed-by: nobody
Diffstat (limited to 'gvdb')
| -rw-r--r-- | gvdb/README | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gvdb/README b/gvdb/README index 94e6c5d..4dbd697 100644 --- a/gvdb/README +++ b/gvdb/README @@ -1,7 +1,12 @@ DO NOT MODIFY ANY FILE IN THIS DIRECTORY -(except maybe the Makefile.am) +(except maybe the meson.build) This directory is the result of a git subtree merge with the 'gvdb' -module on git.gnome.org. Please apply fixes to the 'gvdb' module and -perform a git merge. +module on gitlab.gnome.org. Please apply fixes to the 'gvdb' module and +perform a git merge: + +git remote add gvdb git@gitlab.gnome.org:GNOME/gvdb.git +git remote update gvdb +cd gvdb/ +git merge gvdb/master
\ No newline at end of file |