git-sh | A customized bash environment suitable for git work | Script Programming library

This question has been asked before but hasn't received a complete answer, so I ask it again.

When I tried to revert one of the commits in my git commit history, a conflict occurred, so I tried to fix that by manually editing the conflicted file. I saved the file (using vim) and came back to git bash. Then I tried to finalise the reverting process by adding and commiting the edited file. But still I see (master|reverting) in my prompt (user@123123 MINGW64 ~/Documents/library/Git/s1 (master|REVERTING)). I can get rid of (master|reverting) by using git revert --abort or git revert --skip (using these two commands ignore the whole reverting procedure) but when I use git revert --continue nothing happens. In this step, when I run git status, git shows me the following messages:

I'm searching for a way to find the most recent common ancestor commit for 2+ branches, to find the ideal junction point for patch branches.
About "patch branch", I mean this: https://devblogs.microsoft.com/oldnewthing/20180314-00/?p=98235

I've found 2 commands for this:

Consider the following git log with the following commits

I'm getting this error when pulling from a self-hosted git remote I just added.

I'd like to hash a file in the same way that git hash-object does, so I can compare it to an existing hash, but using Qt and C++.

The answers to this question show how to get the same hash, but none of the examples use C++.

So far this is what we've tried:

I am trying to build the docker-compose container from source. Ultimately I want two of these containers, one for x86_64 and one for an arm arch. I see that I can get the x86 compatible container with this script https://github.com/docker/compose/releases/download/1.25.5/run.sh, but I need to be able to build from source. I have cloned the compose repository and have tried two things, first just trying to build with the Dockerfile in the repo. The result:

I'm trying to package a script to perform deployments with a git push in a Nix derivation. The goal is having a git repo that on post-receive run some actions.

I want to package it so that I can just keep it alongside my configuration and ship it easily, minimising the amount of manual tasks to do.

I've already setup a git user:

This is part of a .bashrc file that sets a prompt, on a Ubuntu 19.10 machine:

Problem and Motivation

We have a larger git repository on our central server. There is a lot of history in it that we want to keep, so rebasing or squashing anything there is not really an option. However, when cloning the repository to our development servers, only recent history is actually relevant. For us, "recent" can be defined as a given tag and any commit earlier in the history can be omitted. The aim here is to save bandwidth, time and disk space.

Ideas for Approach

The current idea is to clone that tag only, using git clone --branch my-root-tag --depth 1, treating it as an artificial root commit in that local repository. Afterwards, adding branches that we'd like to fetch manually using git remote set-branches --add origin some-branch. All of these branches must include my-root-tag somewhere in their history. However, every fetch would now again transfer the entire history. Is there any way to restrict fetches to stop at my-root-tag instead? It sounds like this approach would need something like asked in git shallow clone since specific commit, ideally wrapped in a git alias to "dynamically" calculate the value of the --depth parameter.

Can anyone think of a way to get this to work or even by applying some entirely different approach?

Results

edit: To summarize, it seems that a git fetch does indeed only transfer the commits up to the grafted new repository root (at least in Git v 2.25.1). Only the original clone needs to be parameterized correctly, while subsequent operations on the repository can be performed using regular (unparameterized) git commands. No shallow-include or shallow-exclude options are actually necessary now. This is great news as it makes that configuration a lot less fragile than initially feared.