Памятка по git

[vovs03]

Работа с git (true commits & Flow)

Удаление веток

• локально:

  • git branch -D master
  • git branch -D stage

• на удалённом репозитории:

  • git push origin --delete <branchName>
  • git push origin --delete stage :heart: 2018-12-28

как работать в git с форком

:mega: https://github.com/OsArts/Bible-study

• Чтобы подгрузить в Ваш форк актуальные файлы из первичного репозитория Adventech
  нужно в ветке :warning: stage выполнить:

  • git pull https://github.com/Adventech/sabbath-school-lessons stage
  • git push -u origin stage

• [x] https://github.com/deepmipt/dlschl/wiki/Git:-пошаговая-инструкция

удаление последнего коммита

• https://githowto.com/ru/removing_commits_from_a_branch

git log --pretty --graph --date=short

Алиасы

• https://githowto.com/ru/aliases

• :heart: gb = git --no-pager branch / Просмотр списка веток в терминале

• git hist hist = log --pretty --graph --date=short

• gcm = git checkout master

• gcd = git checkout develop

[vovs03]

4 Useful Solutions to Common Git Problems

• https://dev.to/jacobherrington/4-useful-patterns-in-git-19ac

[vovs03]

Good commits

1st variant

I tend to use emojis for the type - it shows the type of the commit at first glance, e.g.:

➕ :heavy_plus_sign: when adding a file or implementing a feature 🔨 :hammer: when fixing a bug or issue 💚 :green_heart: when improving code or comments ⚡ :zap: when improving performance 📜 :scroll: when updating docs or readme 🔑 :key: when dealing with security 🔁 :repeat: when updating dependencies or data ✅ :white_check_mark: when a new release was built 👕 :shirt: when refactoring or removing linter warnings ❌ :x: when removing code or files

2nd variant

Here is the web for other Git emoji ideas: https://gitmoji.carloscuesta.me/ For me, it looks too much to remember, so I just use some emojis to keep it simple:

• 🎉 :tada: initial commit 🎉
• 🚀 :rocket: [Add] when implementing a new feature
• 🔨 :hammer: [Fix] when fixing a bug or issue
• 🎨 :art: [Refactor] when refactor/improving code
• 🚧 :construction: [WIP]
• 📝 :pencil: [Minor] Some small updates

Mine

• 🔧 :wrench: + 🛠️ :hammer_and_wrench:

[vovs03]

⚗️ :alembic: == feature [feat]

• https://udacity.github.io/git-styleguide/