From fbbd336d20071e53e6068c719c24df636e0d79d6 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Wed, 3 Jul 2024 15:26:41 +0200 Subject: [PATCH] Auto commit 2024-07-03 15:26 --- Le droit d'asile pour les nuls/index.html | 2 +- Phone/Framagenda/index.html | 2 +- color-theme/index.html | 2 +- git/index.html | 80 ++++++++++++++-------- mkdocs/mkdocs.yml | 11 --- mkdocs/update.sh | 62 ----------------- mkdocs/wip | 0 mp4/index.html | 2 +- scaling/index.html | 2 +- sitemap.xml.gz | Bin 127 -> 127 bytes web-css/index.html | 2 +- 11 files changed, 57 insertions(+), 108 deletions(-) delete mode 100644 mkdocs/mkdocs.yml delete mode 100644 mkdocs/update.sh delete mode 100644 mkdocs/wip diff --git a/Le droit d'asile pour les nuls/index.html b/Le droit d'asile pour les nuls/index.html index d1bf32b..41c74d8 100644 --- a/Le droit d'asile pour les nuls/index.html +++ b/Le droit d'asile pour les nuls/index.html @@ -742,7 +742,7 @@ des questions ou des zones d’ombre à éclaircir, n’hésitez pas !

- + diff --git a/Phone/Framagenda/index.html b/Phone/Framagenda/index.html index 1f167a0..6cd0a6e 100644 --- a/Phone/Framagenda/index.html +++ b/Phone/Framagenda/index.html @@ -453,7 +453,7 @@ - + diff --git a/color-theme/index.html b/color-theme/index.html index 219dbff..15ac781 100644 --- a/color-theme/index.html +++ b/color-theme/index.html @@ -558,7 +558,7 @@ - + diff --git a/git/index.html b/git/index.html index 3e01f67..5896d69 100644 --- a/git/index.html +++ b/git/index.html @@ -450,9 +450,11 @@

Git

-

Set upstream: -- git push --set-upstream remote_name local_branch -- git pull --set-upstream remote_name local_branch

+

Set upstream:

+

Delete branch:

-

Move branch -* git checkout OLD_NAME -* git branch -m NEW_NAME

-

Active branch in a bare repository: -* see repo/HEAD (and change it if needed)

-

Create a new branch and switch to it: -* git checkout -b BRANCH

-

Merge unrelated repositories: -* git pull ../other/ master --allow-unrelated-histories --no-rebase

+

Move branch:

+ +

Active branch in a bare repository:

+ +

Create a new branch and switch to it:

+ +

Merge unrelated repositories:

+

Submodules

-

At start: -* git clone XXX --recurse-submodules

-

At new one: -* git submodule add https://github.com/... path -* ./ is allowed, . is not but only on remote paths, not local paths -* ../other-prj.git is also allowed

-

Manually: -* git submodule init -* git submodule update (--recursive)

-

Or in one command: -* git submodule update --init (--recursive)

-

If problems: -* git submodule deinit (--all)

-

If head detached: -* git branch -u <origin>/<branch> <branch> -* git checkout -b <branch> --track <origin>/<branch>

+

At start:

+ +

At new one:

+ +

Manually:

+ +

Or in one command:

+ +

If problems:

+ +

If head detached:

+

The git submodule sync will update your config file with the details from the .gitmodules file, so the latter should be considered the 'master'.

@@ -538,7 +560,7 @@ - + diff --git a/mkdocs/mkdocs.yml b/mkdocs/mkdocs.yml deleted file mode 100644 index aefe3d7..0000000 --- a/mkdocs/mkdocs.yml +++ /dev/null @@ -1,11 +0,0 @@ -site_name: Niki's Doc -theme: - name: material - features: - - content.action.edit -plugins: - - privacy -# - offline -#repo_url: https://github.com/nikiroo/fanfix -# repo_name: squidfunk/mkdocs-material -#edit_uri: edit/master/docs/ diff --git a/mkdocs/update.sh b/mkdocs/update.sh deleted file mode 100644 index a179585..0000000 --- a/mkdocs/update.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -DDIR=/home/user/Notes - -if [ "$1" = "" ]; then - # Host - cd "`dirname "$0"`" - if [ $? != 0 ]; then - echo Cannot find directory \ - | tee mkdocs/error.txt >&2 - exit 42 - fi - cd .. - rm -f mkdocs/ok mkdocs/error.txt - touch mkdocs/wip - OPTS="-v $PWD:$DDIR:rw" /opt/docker/launch.sh \ - --start $DDIR/mkdocs/update.sh mkdocs \ - build - echo - echo Leaving docker machine... - echo - [ -e mkdocs/ok ] ; rep=$? ; rm -f mkdocs/ok - if [ $rep = 0 ]; then - echo Copying to remote site... - cd mkdocs/site - git add . - if [ $? != 0 ]; then - echo Failure to add newly built html site \ - | tee mkdocs/error.txt >&2 - exit 20 - fi - git commit -m "`date +"Auto commit %Y-%m-%d %H:%M"`" - if [ $? != 0 ]; then - echo Failure to commit to git \ - | tee mkdocs/error.txt >&2 - exit 21 - fi - git push nikiroo html - if [ $? != 0 ]; then - echo Failure to push html branch to nikiroo \ - | tee mkdocs/error.txt >&2 - exit 22 - fi - else - echo Failed to update, no remote copy started: $rep \ - | tee mkdocs/error.txt >&2 - fi - rm -f mkdocs/wip - exit $rep -fi - -# Docker -echo -echo Entering docker machine... -echo - -cd -cp "$DDIR/mkdocs/mkdocs.yml" "$HOME/" || exit -ln -s "$DDIR" docs || exit -mkdocs build -d "$DDIR"/mkdocs/site || exit -touch "$DDIR/mkdocs/ok" - diff --git a/mkdocs/wip b/mkdocs/wip deleted file mode 100644 index e69de29..0000000 diff --git a/mp4/index.html b/mp4/index.html index b2e9c44..e5d110d 100644 --- a/mp4/index.html +++ b/mp4/index.html @@ -998,7 +998,7 @@ All the flags not part of an input files (after the last -i) target - + diff --git a/scaling/index.html b/scaling/index.html index 7178f28..0d6c14b 100644 --- a/scaling/index.html +++ b/scaling/index.html @@ -705,7 +705,7 @@ xrandr --fb 1574x884 --output eDP1 --mode 1366x768 --panning 1574x886 --scale 1. - + diff --git a/sitemap.xml.gz b/sitemap.xml.gz index a8b7781f0e21b75a3a68d5bd188de51ea9909561..f5d8e971e0ff9aed16a964de36e7de369db07ad9 100644 GIT binary patch delta 12 Tcmb=gXOr*d;Fu6Nk*yK{7t{l= delta 12 Tcmb=gXOr*d;D`>G$W{pe7RLj6 diff --git a/web-css/index.html b/web-css/index.html index 56ce40d..f4f2ecf 100644 --- a/web-css/index.html +++ b/web-css/index.html @@ -566,7 +566,7 @@ h1 :has(h2) { margin: 0 0 0.25rem 0; } /* less margin if a H2 follows it */ - + -- 2.27.0