summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlapa <vlapa@ya.ru>2026-07-09 16:41:07 +0300
committervlapa <vlapa@ya.ru>2026-07-09 16:41:07 +0300
commit5a70e2254695945d1a5a00f1ab1762af94adad5d (patch)
tree50ae36e52711f42dcda4857a8f2ceae1f16e51b8
parent5638ccc39cb0916853a2dd64250f0a309dbf727e (diff)
добавил в GIT
-rw-r--r--.obsidian/workspace.json20
-rw-r--r--GIT.md20
-rw-r--r--ЭМОДЗИ.md44
3 files changed, 52 insertions, 32 deletions
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 0fc460e..dbd8ae3 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -13,12 +13,12 @@
"state": {
"type": "markdown",
"state": {
- "file": "ЭМОДЗИ.md",
+ "file": "GIT.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
- "title": "ЭМОДЗИ"
+ "title": "GIT"
}
}
]
@@ -166,8 +166,15 @@
},
"active": "d66a4d1f8691f9e8",
"lastOpenFiles": [
- "_PROGRAMs/ESP8266-ESP32/RTC_память.md",
"ЭМОДЗИ.md",
+ "LINUX/MC.md",
+ "LINUX/DISK/FSTAB.md",
+ "LINUX/DISK/Автоматическое монтирование USB накопителя в заданную папку.md",
+ "LINUX/CERTBOT.md",
+ "LINUX/DISK/SMARTMONTOOLS.md",
+ "LINUX/DISK/DF, DU.md",
+ "GIT.md",
+ "_PROGRAMs/ESP8266-ESP32/RTC_память.md",
"_PROGRAMs/C++/WiFi.md",
"_PROGRAMs/C++/TIME.md",
"_PROGRAMs/C++/snprintf.md",
@@ -183,16 +190,9 @@
"LINUX/SCP, SFTP.md",
"LINUX/Let's Encrypt.md",
"PYTHON/HTTP.md",
- "GIT.md",
"GIT_new.md",
"GIT_new-2.md",
- "LINUX/TMUX.md",
"GIT_new-2",
- "LINUX/MC.md",
- "LINUX/WIREGUARD.md",
- "LINUX/VSFTPD.md",
- "LINUX/USER.md",
- "LINUX/BASH_script/Обновление списка пакетов и установка обновлений.md",
"files/СкриптыДляАдмина.jpg",
"files/6cda81091bcc9f99ad224bd5c5426f8e.png",
"files/32de918111f7fed3e8183b4b9148286b.png",
diff --git a/GIT.md b/GIT.md
index be92c2a..97712f3 100644
--- a/GIT.md
+++ b/GIT.md
@@ -1,6 +1,26 @@
![[GIT_шпаргалка.jpg]]
```sh
+
+## Команды для работы с `.gitignore`
+
+bash
+
+# Проверить, какие файлы игнорируются
+git status --ignored
+# Проверить, почему файл игнорируется
+git check-ignore -v config.h
+# Удалить файл из индекса Git (но оставить на диске)
+git rm --cached config.h
+# Добавить файл в .gitignore
+echo "config.h" >> .gitignore
+# Применить .gitignore к уже добавленным файлам
+git rm -r --cached .
+git add .
+git commit -m "Apply .gitignore"
+
+#=======================================
+
sudo apt install git
git config --global --edit
git config --global user.name "Name_Name"
diff --git a/ЭМОДЗИ.md b/ЭМОДЗИ.md
index c7f7b12..70b58e5 100644
--- a/ЭМОДЗИ.md
+++ b/ЭМОДЗИ.md
@@ -140,28 +140,28 @@
|---|---|---|---|
|1231|📝|&#55357;&#56541;|U+1F4DD|
-| | | | |
-|---|---|---|---|
-|1232|💼|&#55357;&#56508;|U+1F4BC|
-|1233|📁|&#55357;&#56513;|U+1F4C1|
-|1234|📂|&#55357;&#56514;|U+1F4C2|
-|1235|🗂|&#55357;&#56770;|U+1F5C2|
-|1236|📅|&#55357;&#56517;|U+1F4C5|
-|1237|📆|&#55357;&#56518;|U+1F4C6|
-|1238|🗒|&#55357;&#56786;|U+1F5D2|
-|1239|🗓|&#55357;&#56787;|U+1F5D3|
-|1240|📇|&#55357;&#56519;|U+1F4C7|
-|1241|📈|&#55357;&#56520;|U+1F4C8|
-|1242|📉|&#55357;&#56521;|U+1F4C9|
-|1243|📊|&#55357;&#56522;|U+1F4CA|
-|1244|📋|&#55357;&#56523;|U+1F4CB|
-|1245|📌|&#55357;&#56524;|U+1F4CC|
-|1246|📍|&#55357;&#56525;|U+1F4CD|
-|1247|📎|&#55357;&#56526;|U+1F4CE|
-|1248|🖇|&#55357;&#56711;|U+1F587|
-|1249|📏|&#55357;&#56527;|U+1F4CF|
-|1250|📐|&#55357;&#56528;|U+1F4D0|
-|1251|✂|&#9986;|U+2702|
+| | | | |
+| ---- | --- | ---------------- | ------- |
+| 1232 | 💼 | &#55357;&#56508; | U+1F4BC |
+| 1233 | 📁 | &#55357;&#56513; | U+1F4C1 |
+| 1234 | 📂 | &#55357;&#56514; | U+1F4C2 |
+| 1235 | 🗂 | &#55357;&#56770; | U+1F5C2 |
+| 1236 | 📅 | &#55357;&#56517; | U+1F4C5 |
+| 1237 | 📆 | &#55357;&#56518; | U+1F4C6 |
+| 1238 | 🗒 | &#55357;&#56786; | U+1F5D2 |
+| 1239 | 🗓 | &#55357;&#56787; | U+1F5D3 |
+| 1240 | 📇 | &#55357;&#56519; | U+1F4C7 |
+| 1241 | 📈 | &#55357;&#56520; | U+1F4C8 |
+| 1242 | 📉 | &#55357;&#56521; | U+1F4C9 |
+| 1243 | 📊 | &#55357;&#56522; | U+1F4CA |
+| 1244 | 📋 | &#55357;&#56523; | U+1F4CB |
+| 1245 | 📌 | &#55357;&#56524; | U+1F4CC |
+| 1246 | 📍 | &#55357;&#56525; | U+1F4CD |
+| 1247 | 📎 | &#55357;&#56526; | U+1F4CE |
+| 1248 | 🖇 | &#55357;&#56711; | U+1F587 |
+| 1249 | 📏 | &#55357;&#56527; | U+1F4CF |
+| 1250 | 📐 | &#55357;&#56528; | U+1F4D0 |
+| 1251 | ✂ | &#9986; | U+2702 |
| | | | |
|---|---|---|---|