Skip to content

Max's Blog

  • Home
  • About
Max's Blog

Category: Version control

March 3, 2025 max-sperling

Git-submodule and Git-lfs

Git-submodule … allows you to include one repository inside another, keeping them as separate projects. Add a submodule to your

Continue reading
February 11, 2025 max-sperling

Q&A – Version control

Undo “git rebase -i” $ git rebase -i HEAD~3 $ git reflog … HEAD@{0}: rebase (finish): … … HEAD@{1}: rebase

Continue reading
November 28, 2024 max-sperling

List my remote branches (Git)

Command The following command prints the remote branch names, where you are the author of the last pushed commit. $

Continue reading
September 10, 2024 max-sperling

Rename a branch (Git)

0. Preparation Checkout the branch you want to rename. 1. Rename local $ git branch -m new-branch-name 2. Change remote

Continue reading
May 29, 2024 max-sperling

2-way vs. 3-way merge

Scenario c1b06e — 62d8d3 [feature] / e73a83 — 6cfaec — 90ed1b [develop] Goal: Merge feature into develop. 2-way merge Solve

Continue reading
May 10, 2024 max-sperling

Garbage Collection (Git)

Facts It can be locally configured. It can be triggered manually as well. It cleans up not only orphaned commits.

Continue reading
January 12, 2024 max-sperling

Setup ssh key for Git (macOS, Linux)

If you don’t want to authorize yourself all the time on the server, just add an ssh key. 1. Generate

Continue reading
April 21, 2022 max-sperling

Modify commit in history (Git)

Continue reading
November 16, 2021 max-sperling

Reapply patches to updates (Git)

Let’s asume you have a repo containing an external SW. (forked repo or specific version) Branches | Commits ————–|————— master

Continue reading
October 2, 2020 max-sperling

Resolve conflicts for binary files (Git)

There are common scenarios where you possibly have to resolve conflicts. They are cherry-pick, merge, rebase and revert. If those

Continue reading

Posts navigation

1 2 3 Next Posts»

Categories

  • Other (17)
    • Games (11)
    • Nutrition (4)
    • Traveling (2)
  • Science (17)
    • Chemistry (3)
    • Linguistics (2)
    • Math (10)
    • Physics (2)
  • Sport (71)
    • Climbing (5)
    • Diving (20)
    • Fitness (7)
    • Martial arts (33)
      • Ground fighting (9)
      • Mixed martial arts (4)
      • Stand-up fighting (11)
    • Running (1)
    • Surfing (2)
    • Swimming (1)
    • Volleyball (2)
  • Technology (265)
    • Computer (235)
      • Architecture & Design (15)
      • Artificial intelligence (3)
      • Audio & Video (11)
      • Building & Reversing (15)
        • CMake (2)
      • Computational complexity (3)
      • Computer architecture (5)
      • Debugging & Memory (23)
      • Development (58)
        • CI/CD (1)
        • Programming (48)
          • Concurrency (5)
          • Data structures (12)
          • Pointers & References (7)
        • Scripting (3)
        • Testing (6)
      • Development process (5)
      • Hacking & Security (17)
      • Hardware & Protocols (8)
      • Networking (11)
      • Operating system (18)
        • Linux (11)
        • Windows (7)
      • Regular expression (2)
      • Tool configuration (5)
      • Version control (22)
      • Virtualization (7)
      • Web (27)
    • Electrics (9)
    • Mechanics (15)
    • Medicine (2)
    • Photography (4)
WordPress Theme: Wellington by ThemeZee.