# Setting your branch to exactly match the remote branch can be done in two steps:
git fetch origin
git fetch origin
git reset --hard origin/master

# list all commits, 1 per line with comment and date
git log --pretty=format:"%ad:%an:%d:%B" --date=short --reverse --all --since=2.months.ago --author=Mendoza

# throw every local change away, go to the remote state of master
git reset --hard origin/master

# remove untracked files, dirs
git clean -f
git clean -fd

# If you want to revert changes made to the index (i.e., that you have added), do this. Warning this will reset all of your unpushed commits to master!
git reset

Gitflow Workflow - this is the workflow, which describes when to branch during the development

• Own Main Branch (Tags with Versions)
• Branch for Development
• Branch for each Feature
• Branch for each Release

https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow

• Use the http / https repository for cloning.
• Add Git at the URL End
• Use TortoiseGit or MSYGit - <fc #FF0000>NOT the Eclipse plugin Egit</fc> it makes problems with some repos

git clone http://git.eclipse.org/gitroot/e4/eclipse.platform.runtime.e4.git

Storing the SSH private key to be used by TortoiseGit. The key must be in Putty format.

rename the key in “id_rsa” copy the key to

"C:\Users\USERNAME\.ssh\id_rsa"

Also store it in the global upstream:

git config --global remote.gitlab.puttykeyfile C:\\Users\\USERNAME\\id_rsa

This is the console for Git with own Syntax. It is started with

...\Programme\MsyGit\bin\sh.exe --login -i

File: C:\Users\<USERNAME>\.gitconfig

You can use the cmd to config git. Tell it the default user name / mail

git config --global user.name "John Doe"
git config --global user.email johndoe@example.com

File: C:\Users\<USERNAME>\.ssh\config

Configure ssh to use e.g. the github-key for github url.

• Use the / notation to point git to the place where you keep the keys. I keep them in my back-up folder.
• Use quotes “ especially if you have empty spaces.

Host github.com
    Hostname github.com
    User git
    IdentityFile "/C/YOUR PATH TO KEY FOLDER/_KEYS/Github/github-privateKey"

The credentials may be stored globally or project-locally.
THe local config is located in .git/config
THe global config is located in /home/YOURUSER/.gitconfig

Advice git to store the credentials in a file. The config saying where to find the pass is stored locally (.git/config)

git config credential.helper store 'store --file ~/.git-credentials'

The credentials-configurations, saying where to look for the password are located in .git/config
store means, that the password is stored plain text in a file, default location ~/.git-credentials

Hpw the entry in .git/config look like

[credential]
        helper = store

Used credentials are in file ~/.git-credentials

http://developer:KC2SK0VRWT6FBoAyy2bAlNo3ytQ3-ad_HUZ4gBJDbvQ@git-aic.173.31.18.48.nip.io

Using the key –global will advice git to store the configs globally for all projects The config saying where to find the pass is then stored in, ~/gitconfig not in (.git/config)

git config --global credential.helper store 'store --file ~/.git-credentials'

In Gerrit there are Links of the form:

git fetch git://git.eclipse.org/gitroot/tycho/org.eclipse.tycho refs/changes/63/8163/2 && git checkout FETCH_HEAD
git fetch https://git.eclipse.org/r/tycho/org.eclipse.tycho refs/changes/63/8163/2 && git format-patch -1 --stdout FETCH_HEAD

git fetch git://git.eclipse.org/gitroot/tycho/org.eclipse.tycho refs/changes/63/8163/1 && git checkout FETCH_HEAD
git fetch https://git.eclipse.org/r/tycho/org.eclipse.tycho refs/changes/63/8163/1 && git checkout FETCH_HEAD

Use the https links, to checkoout. The repository URL is here: https://git.eclipse.org/r/tycho/org.eclipse.tycho.git

The right Syntax to check out with MsyGit the given repository from above is:

 git clone https://git.eclipse.org/r/tycho/org.eclipse.tycho.git

To authenticate via SSH key - create a central configuration file and associate the URL with the private-key there.

%userprofile%/.ssh/config

Host code.mydomain.com
  IdentityFile C:\\1REPOS\\1code.mydomain\\ssh\\gitlab.ppk

Alternatively you can use TortoiseGit with a putty key.

Git may convert the Windows line breaks (CRLF) to Linux (LF)

Which will break shell scripts.

To disable it - open C:\ProgramData\Git\config

and modify

[core]
	autocrlf = false

overwriting the remote history in GIT repo with commitId 9718422f4b79189c708d95f3302ce95f0bd10631

# find your commit id 9718422f4b79189c708d95f3302ce95f0bd10631
git log

git reset --hard 9718422f4b79189c708d95f3302ce95f0bd10631

git push --force-with-lease

# AT THE BEGINNING make sure you pushed all your local changes before you start

# executing commands below is basically equivalent to fresh "git clone"

# resets the current branch tip, and also deletes any changes in the working directory and staging area.
git reset --hard

# make sure you’re in the correct branch
git checkout "feat/adr-db-eco-0238-onboarding-service-device-enriched-api"

# This will remove all local untracked files, so only git tracked files remain
git clean -fdx



# make sure, that the "local repository" is up to date
git fetch origin main --verbose




# see https://docs.gitlab.com/ee/topics/git/git_rebase.html
# now rebase it against main
# prefer "origin/main" changes during conflicts
git rebase -Xtheirs origin/main


# Here I found conflict :( between Ola's changes on the swagger integration and changes made by Remy
# so I switched to the UI "TortoiseGit" to resolve em..

# continued rebasing after the resolution
# reapedly till no conflicts
git rebase --continue


# finally overwrite the remote history with the new rebased one
git push --force-with-lease

https://stackoverflow.com/questions/13716658/how-to-delete-all-commit-history-in-github

#  first backup your history by copying the branch.
#  can remove it later
git switch master
git branch master_history_2023_11_31
git push origin -u master_history_2023_11_31




# Checkout as orphan, without history
git checkout --orphan latest_branch

# Add all the files
git add -A

# Commit the changes
git commit -am "commit message"

# Delete the branch
git branch -D master

# Rename the current branch to master
git branch -m master

# Finally, force update your repository
git push -f origin master

Delete branch latest_branch

git branch -D latest_branch

git push origin --delete latest_branch

objects/pack: This folder contains packed object files. Git occasionally compresses objects into packfiles to save space and improve performance.

Sometimes in objects/pack there are blobs collected. Even if you removed the history on the current branch, they might persist blowing up the repo.

To clean them up - use the garbage collector.

# This command is used to expire all entries in the reflog that are not reachable from the current commit (i.e., entries that are not part of any branch or tag). The --expire-unreachable=all flag specifies that even unreachable entries (such as commits that were "lost" due to being orphaned or removed by a rebase or reset) should be expired. 
# The --all flag ensures that it applies to all branches and tags, not just the current branch.
git reflog expire --expire-unreachable=all --all



# This command triggers Git's garbage collection process (gc stands for "garbage collect"). The --prune=all flag tells Git to aggressively prune all unreachable objects, including unreferenced commits, blobs, trees, and other data that are not reachable from any branch, tag, or reflog entry. This helps to reclaim disk space by removing unnecessary or dangling objects from the repository.

git gc --prune=all