{"id":4433,"date":"2019-04-11T19:26:38","date_gmt":"2019-04-11T17:26:38","guid":{"rendered":"http:\/\/blog.via-internet.de\/?p=4433"},"modified":"2021-11-23T18:52:58","modified_gmt":"2021-11-23T17:52:58","slug":"github-cookbook-2","status":"publish","type":"post","link":"https:\/\/via-internet.de\/blog\/2019\/04\/11\/github-cookbook-2\/","title":{"rendered":"Git | Cookbook"},"content":{"rendered":"\n

Github hints<\/h2>\n\n\n\n

Repository \u2014 Quick setup<\/strong><\/h3>\n\n\n\n

Clone repository<\/p>\n\n\n\n

.. or create a new repository on the command line<\/p>\n\n\n\n

echo \"# Init \" >> README.md\ngit init\ngit add README.md\ngit commit -m \"first commit\"\ngit remote add origin <url>\ngit push -u origin master<\/pre>\n\n\n\n
\u2026or push an existing repository from the command line<\/p>\n\n\n\n
git remote add origin git@github.com:<username>\/<repository>.git\ngit push -u origin master<\/pre>\n\n\n\n
Merge branch with master<\/h3>\n\n\n\n
Merging via command line<\/h4>\n\n\n\n
\n
\n
Step 1:<\/strong> From your project repository, bring in the changes and test. <\/p>\n<\/div>\n\n\n\n
\n
git fetch origin\ngit checkout -b develop origin\/develop\ngit merge master<\/pre>\n<\/div>\n<\/div>\n\n\n\n
\n
\n
Step 2:<\/strong> Merge the changes and update on GitHub.  <\/p>\n<\/div>\n\n\n\n
\n
git checkout master\ngit merge --no-ff develop\ngit push origin master<\/pre>\n<\/div>\n<\/div>\n\n\n\n
Useful commands<\/h2>\n\n\n\n
To show information about a remote, for example if tracked branches are up-to-date:<\/h4>\n\n\n\n
git remote show origin\ngit remote -v\ngit remote add <shortname> <url>\ngit fetch <remote>\ngit push <remote> <branch>\ngit remote show <remote>\ngit remote rename <old> <new>\ngit remote remove <name><\/pre>\n\n\n\n
To show log messages of the changes between branches:<\/h4>\n\n\n\n
git log origin\/master ^master<\/pre>\n\n\n\n
Show log graph<\/h4>\n\n\n\n
git log --pretty=format:\"\n\n\n\n
To show differences between branches:<\/h4>\n\n\n\n
$ git diff master origin\/master<\/pre>\n\n\n\n
Show , what git pull will doing<\/h4>\n\n\n\n
$ git fetch && git diff HEAD..@{u}<\/pre>\n\n\n\n
Or add the command to  ~\/.gitconfig file:<\/p>\n\n\n\n
[alias]\n        diffpull=!git fetch && git diff HEAD..@{u}<\/pre>\n\n\n\n
Run this to see how git diff resolution works<\/h4>\n\n\n\n
git rev-parse origin<\/pre>\n\n\n\n
Delete remote branch<\/h4>\n\n\n\n
git clone <repository> master\ncd master\ngit push origin --delete feature-2.01.03<\/pre>\n\n\n\n
Show log<\/h4>\n\n\n\n
git log --oneline --graph --all --decorate<\/pre>\n\n\n\n
Undo commit<\/h4>\n\n\n\n
git commit --amend<\/pre>\n\n\n\n
Unstaging a staged file<\/h4>\n\n\n\n
git reset HEAD <filename><\/pre>\n\n\n\n
Unmodifying a Modified File<\/h4>\n\n\n\n
$ git checkout -- <filename><\/pre>\n\n\n\n
Retrieve last modification date <\/h4>\n\n\n\n
git ls-files -z | xargs -0 -n1 -I{} -- git log -1 --format=\"\n\n\n\n
Git Configuration<\/h2>\n\n\n\n
Show location of configuration files<\/h3>\n\n\n\n
git config --list --show-origin<\/pre>\n\n\n\n
This dows not work, if you have set the environment var GIT_CONFIG. In this case, do<\/p>\n\n\n\n
unset GIT_CONFIG\ngit config --global --list<\/pre>\n\n\n\n
Edit config files<\/h2>\n\n\n\n
git config --edit --global<\/pre>\n\n\n\n
git config --edit --system<\/pre>\n\n\n\n
DESCRIPTION<\/th>GIT COMMAND<\/th><\/tr><\/thead>
Configure the author name to be used with your commits.<\/td>git config --global user.name \"XXX\"<\/code><\/td><\/tr>
Configure the author email address to be used with your commits<\/td>git config --global user.email xxx@example.com<\/code><\/td><\/tr>
Will remove user credential details from the repository<\/td>git config --local credential.helper \"\"<\/code><\/td><\/tr>
<\/td>git config \u2014show-origin <\/td><\/tr>
List all currently configured remote repository URLs<\/td>git remote -v<\/code><\/td><\/tr>
If you haven’t connected your local repository to a remote server, To add a remote server to a local repository<\/td>git remote add origin <repo_url><\/code><\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
Git Commit and Push<\/h2>\n\n\n\n
DESCRIPTION<\/th>GIT COMMAND<\/th><\/tr><\/thead>
Create a file name README.md<\/code> with Readme content<\/code> content<\/td>echo \"Readme content\" >> README.md<\/code><\/td><\/tr>
List the files you’ve changed and those you still need to add or commit<\/td>git status<\/code><\/td><\/tr>
Add all or one file to staging<\/td>git add .<\/code> OR git add file_name<\/code><\/td><\/tr>
Commit changes to head with message<\/td>git commit -m 'message'<\/code><\/td><\/tr>
Commit any files you’ve added with git add<\/code>, and also commit any files you’ve changed since then<\/td>git commit -a<\/code><\/td><\/tr>
Send all commits from local repository to remote repository<\/td>git push<\/code><\/td><\/tr>
Do a git push<\/code> and sets the default remote branch for the current local branch. So any future git pull<\/code> command will attempt to bring in commits from the <remote-branch><\/code>into the current local branch<\/td>git push -u <remote-branch><\/code><\/td><\/tr>
Send changes to the master branch of your remote repository<\/td>git push origin master<\/code><\/td><\/tr>
Push a specific branch to your remote repository<\/td>git push origin <branch_name><\/code><\/td><\/tr>
Push all branches to your remote repository<\/td>git push --all origin<\/code><\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
Working with the Git Workflow<\/h2>\n\n\n\n
The following steps are based on a branching model,  described here<\/a>.<\/p>\n\n\n\n
Name<\/th> Beschreibung<\/th><\/tr>
master<\/td><\/td><\/tr>
hotfixes<\/td><\/tr>
release<\/td><\/tr>
develop<\/td><\/tr>
feature<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
Working with branches<\/h3>\n\n\n\n
Create branch ‘develop’<\/h4>\n\n\n\n
$ git clone git@github.com:<USER>\/<REPO>.git develop\n$ cd develop\n$ git checkout -b develop\n$ git push --set-upstream origin develop<\/pre>\n\n\n\n
Create branch ‘feature-xxx’<\/h4>\n\n\n\n
We dont’t want do clone the whole repository, but only the files needed for the feature<\/p>\n\n\n\n
$ git clone -b develop -n --depth 1 git@github.com:<USER>\/<REPO>.git feature-2.2.0\n$ cd feature-2.2.0\n<\/pre>\n\n\n\n
Branch l\u00f6schen<\/h4>\n\n\n\n
$ git push origin -delete hotfix-1.2.1-compress-data<\/pre>\n\n\n\n
Workflow – Cheatsheet<\/h3>\n\n\n\n
Working with branches<\/h4>\n\n\n\n
How to rename git local and remote branches<\/strong><\/p>\n\n\n\n
\n
\n
Check out branch with old name<\/p>\n<\/div>\n\n\n\n
\n
git checkout feature-2.1.2<\/pre>\n<\/div>\n<\/div>\n\n\n\n
\n
\n
Rename branch<\/p>\n<\/div>\n\n\n\n
\n
git branch -m feature-2.01.02<\/pre>\n<\/div>\n<\/div>\n\n\n\n
\n
\n
Checkin branch with new name<\/p>\n<\/div>\n\n\n\n
\n
git push origin :feature-2.1.2 feature-2.01.02<\/pre>\n<\/div>\n<\/div>\n\n\n\n
1. Rename your local branch.<\/strong><\/p>\n\n\n\n
If you have named a branch incorrectly AND pushed this to the remote repository follow these steps before any other developers get a chance to jump on you and give you shit for not correctly following naming conventions.<\/p>\n\n\n\n
If you are on the branch you want to rename:<\/p>\n\n\n\n
git branch -m new-name<\/pre>\n\n\n\n
If you are on a different branch:<\/p>\n\n\n\n
git branch -m old-name new-name<\/pre>\n\n\n\n
2. Delete the old-name remote branch and push the new-name local branch.<\/strong><\/p>\n\n\n\n
git push origin :old-name new-name<\/pre>\n\n\n\n
3. Reset the upstream branch for the new-name local branch.<\/strong>Switch to the branch and then:<\/p>\n\n\n\n
git push origin -u new-name<\/pre>\n\n\n\n
Or you as a fast way to do that, you can use these 3 steps: command in your terminal<\/p>\n\n\n\n
git branch -m old_branch new_branch         # Rename branch locally    \ngit push origin :old_branch                 # Delete old branch    \ngit push --set-upstream origin new_branch   # Push new branch, set local branch to track new remote<\/pre>\n\n\n\n
<\/tr><\/tbody><\/table><\/figure>\n\n\n\n
Neues Feature erstellen<\/th><\/tr>
Repository clonen<\/td>$ git checkout -b feature-1.2.2 develop<\/td><\/tr>
\u00c4nderungen durchf\u00fchren<\/td><\/tr>
\u00c4nderungen einchecken<\/td>$ git checkout develop
$ git merge –no-ff feature-1.2.2 
$ git branch -d feature-1.2.2 
$ git push origin develop <\/td><\/tr>
<\/tr><\/tbody><\/table><\/figure>\n\n\n\n
Neuen Hotfix erstelllen<\/th><\/tr>
Repository auschecken<\/td>$ git checkout -b hotfix-1.2.1 master<\/td><\/tr>
\u00c4nderungen durchf\u00fchren<\/td><\/tr>
\u00c4nderungen einchecken<\/td>$ git commit -a -m “hotfix: hotfix-1.2.1| compress mart”<\/td><\/tr>
Hotfix beenden<\/td>$ git checkout master
$ git merge –no-ff hotfix-1.2.1 
$ git tag -a 1.2.1<\/td><\/tr>
Hotfix in Master einchecken<\/td>$ git checkout develop
$ git merge –no-ff hotfix-1.2.1   <\/td><\/tr>
Hotfix Branch entfernen<\/td>$ git branch -d hotfix-1.2.1<\/td><\/tr>
Neues Release erstellen:<\/th><\/tr>
Repository clonen<\/td>$ git checkout -b release-1.2 develop<\/td><\/tr>
\u00c4nderungen durchf\u00fchren<\/td><\/tr>
\u00c4nderungen einchecken<\/td>$ git commit -a -m “release: changes for release 1.2”<\/td><\/tr>
Release beenden<\/td>$ git checkout master
$ git merge –no-ff release-1.2
$ git tag -a 1.2<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
Git Flow<\/h2>\n\n\n\n
Initialize<\/h4>\n\n\n\n
Start using git-flow by initializing it inside an existing git repository:<\/p>\n\n\n\n
$ git flow init<\/pre>\n\n\n\n
Start a new feature<\/h4>\n\n\n\n
Development of new features starting from the ‘develop’ branch.<\/p>\n\n\n\n
git flow feature start MYFEATURE<\/pre>\n\n\n\n
Finish up a feature<\/h4>\n\n\n\n
Finish the development of a feature. This action performs the following<\/p>\n\n\n\n
git flow feature finish MYFEATURE<\/pre>\n\n\n\n
Publish a feature<\/h4>\n\n\n\n
Publish a feature to the remote server so it can be used by other users.<\/p>\n\n\n\n
git flow feature publish MYFEATURE<\/pre>\n\n\n\n
Getting a published feature<\/h3>\n\n\n\n
Get a feature published by another user.<\/p>\n\n\n\n
git flow feature pull origin MYFEATURE<\/pre>\n\n\n\n
You can track a feature on origin by using<\/p>\n\n\n\n
git flow feature track MYFEATURE<\/pre>\n\n\n\n
Start a release<\/h4>\n\n\n\n
git flow release start RELEASE [BASE]<\/pre>\n\n\n\n
It’s wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:<\/p>\n\n\n\n
git flow release publish RELEASE<\/pre>\n\n\n\n
(You can track a remote release with the 
git flow release track RELEASE<\/code>command)<\/p>\n\n\n\n
Finish up a release<\/h4>\n\n\n\n
git flow release finish RELEASE<\/pre>\n\n\n\n
Don’t forget to push your tags with git push origin --tags<\/code><\/p>\n\n\n\n
Hotfixes<\/h4>\n\n\n\n
git flow hotfix start VERSION [BASENAME]<\/pre>\n\n\n\n
Finish a hotfix<\/h4>\n\n\n\n
git flow hotfix finish VERSION<\/pre>\n\n\n\n
Usefull commands<\/h2>\n\n\n\n
<\/tr><\/tr>
basic commands<\/th>description<\/th><\/tr>
git init<\/td><\/tr>
git status  [ -s ]<\/td>status of files and local repo<\/td><\/tr>
git ls-files<\/td>show files which are tracked by git<\/td><\/tr>
git log [ –oneline ]
git log [–oneline –graph –decorate –all]<\/td>		shows commit history<\/td><\/tr>
git add <changed file>
git add .git add -u<\/td>		add single file to indexadd all files from the workspace to indexstage current workspace into index to cleanup inconsistencies<\/td><\/tr>
git commit [ -m ‘message’ ]<\/td>commit into local repo only<\/td><\/tr>
git push -u origin master<\/td>push the repo from local to remote repo<\/td><\/tr>
git help [option]<\/td>get help page for specific options<\/td><\/tr>
git config –global alias.bla “command”
git bla [– <filename>]<\/td>		set alias bla to a specific commandexec alias (for specific file)<\/td><\/tr>
git mv fileA fileB
git commit -m “…..”<\/td>		rename fileA to fileBand commit<\/td><\/tr>
git rm fileC
git commit -m “…..”<\/td>		delete fileCand commit<\/td><\/tr>
advanced commands<\/th>description<\/th><\/tr>
git reset HEAD <filename><\/td>undo changes from index back to workspace<\/td><\/tr>
git checkout <filename>
git checkout master
git checkout <branchname><\/td>		checkout single file from local repo to workspacecheckout\/switch to the master branchcheckout\/switch to another branch<\/td><\/tr>
git checkout -b <new branchname>
git branch <new branchname><\/td>		create new branch and switch to it immediatelycreate new branch in the background, doesn’t switch to it<\/td><\/tr>
git branch<\/td>shows all available branches<\/td><\/tr>
git diff
git difftool<\/td>		show differences of local and committed file
shows diff in vimdiff<\/td><\/tr>
git merge <other branch>
git mergetool<\/td>		merge other branch into master (current branch)manage the different files in vimdiff<\/td><\/tr>
git branch -d <branchname><\/td>delete branch (does NOT include merge)<\/td><\/tr>
git branch -m <new name><\/td>rename a <\/td><\/tr>
$ git diff master..development <\/td>compare two branches<\/td><\/tr>
git tag <mytag>
git tag -a v1.0 -m “description”
git show v1.0<\/td>		add an additional label\/tag to a branchannotation tag with release informationshows details of tag v1.0<\/td><\/tr>
git stash<\/td><\/tr>
git reset <ID> [–soft | –mixed | –hard]
git reflog ….<\/td><\/tr>
git fetch ….<\/td>update local repo with changes from remote repo. (non destructive)<\/td><\/tr>
git pull …<\/td>update local repo with changes from remote repo. it does effectively a fetch and merge in one command<\/td><\/tr>
git clone https:\/\/<username<\/em>>:<token<\/em>>@github.com\/<organisation-space<\/em>>\/<repository<\/em>>
<\/td>		download the remote repo into local workspace<\/td><\/tr>
git remote -v
git remote show origin<\/td>		shows url of remote reposhows detail infos of a remote repo<\/td><\/tr>
.gitignore<\/td>contains filename to exclude from git<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
Git Workflow<\/h2>\n\n\n\n
Release<\/h3>\n\n\n\n
Creating a release branch<\/h4>\n\n\n\n
\n
\n
\n\nRelease branches are created from the develop<\/code> branch. For example, say version 1.1.5 is the current production release and we have a big release coming up. The state of develop<\/code>is ready for the \u201cnext release\u201d and we have decided that this will become version 1.2 (rather than 1.1.6 or 2.0). So we branch off and give the release branch a name reflecting the new version number:\n\n<\/p>\n<\/div>\n\n\n\n
\n
$ git checkout -b release-1.2 develop<\/pre>\n<\/div>\n<\/div>\n\n\n\n
\n
\n
After creating a new branch and switching to it, we bump the version number. Here, bump-version.sh<\/code> is a fictional shell script that changes some files in the working copy to reflect the new version. (This can of course be a manual change\u2014the point being that some<\/em> files change.) Then, the bumped version number is committed.<\/p>\n\n\n\n
This new branch may exist there for a while, until the release may be rolled out definitely. During that time, bug fixes may be applied in this branch (rather than on the develop<\/code>branch). Adding large new features here is strictly prohibited. They must be merged into develop<\/code>, and therefore, wait for the next big release.<\/p>\n<\/div>\n\n\n\n
\n
$ .\/bump-version.sh 1.2<br>\n$ git commit -a -m \"Version 1.2\"<\/pre>\n<\/div>\n<\/div>\n\n\n\n
 Finishing a release branch  <\/h4>\n\n\n\n
$ git checkout master\n$ git merge --no-ff release-1.2\n$ git tag -a 1.2\n$ git checkout develop\n$ git merge --no-ff release-1.2\n$ git branch -d release-1.2<\/pre>\n\n\n\n
\n
\n
When the state of the release branch is ready to become a real release, some actions need to be carried out.<\/p>\n\n\n\n
First, the release branch is merged into master<\/code> (since every commit on master<\/code> is a new release by definition<\/em>, remember).<\/p>\n\n\n\n
Next, that commit on master<\/code> must be tagged for easy future reference to this historical version. <\/p>\n\n\n\n
Finally, the changes made on the release branch need to be merged back into develop<\/code>, so that future releases also contain these bug fixes. <\/p>\n<\/div>\n\n\n\n
\n
$ git checkout master\n$ git merge --no-ff release-1.2\n$ git tag -a 1.2<\/pre>\n<\/div>\n<\/div>\n\n\n\n
\n
\n
The release is now done, and tagged for future reference.<\/p>\n\n\n\n
To keep the changes made in the release branch, we need to merge those back into develop<\/code>, though. In Git:<\/p>\n<\/div>\n\n\n\n
\n
$ git checkout develop\n$ git merge --no-ff release-1.2<\/pre>\n<\/div>\n<\/div>\n\n\n\n
\n
\n
This step may well lead to a merge conflict (probably even, since we have changed the version number). If so, fix it and commit.<\/p>\n\n\n\n
Now we are really done and the release branch may be removed, since we don\u2019t need it anymore:<\/p>\n<\/div>\n\n\n\n
\n
$ git branch -d release-1.2<\/pre>\n<\/div>\n<\/div>\n\n\n\n
Feature<\/h3>\n\n\n\n
\"\"<\/figure>\n\n\n\n
$ git checkout -b myfeature develop\n$ .. do changes...\n\n$ git checkout develop\n$ git merge --no-ff myfeature\n$ git branch -d myfeature\n$ git push origin develop<\/pre>\n\n\n\n
\n
\n
Creating a feature branch <\/h4>\n\n\n\n
When starting work on a new feature, branch off from the develop<\/code> branch.<\/p>\n\n\n\n
$ git checkout -b myfeature develop\nSwitched to a new branch \"myfeature\"\n<\/pre>\n\n\n\n
Incorporating a finished feature on develop <\/h4>\n\n\n\n
Finished features may be merged into the develop<\/code> branch to definitely add them to the upcoming release:<\/p>\n\n\n\n
$ git checkout develop<\n$ git merge --no-ff myfeature\n$ git branch -d myfeature\n$ git push origin develop <\/pre>\n<\/div>\n\n\n\n
<\/div>\n<\/div>\n\n\n\n
\n
\n
 The --no-ff<\/code> flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature.<\/p>\n\n\n\n
In the latter case, it is impossible to see from the Git history which of the commit objects together have implemented a feature\u2014you would have to manually read all the log messages. Reverting a whole feature (i.e. a group of commits), is a true headache in the latter situation, whereas it is easily done if the --no-ff<\/code> flag was used. <\/p>\n<\/div>\n\n\n\n
\n
\"\"\/<\/figure>\n\n\n\n
<\/p>\n<\/div>\n<\/div>\n\n\n\n
Hotfix<\/h2>\n\n\n\n
\"\"<\/figure>\n\n\n\n
$ git checkout -b hotfix-1.2.1 master\n$ ... do changes ... \n$ git commit -a -m \"Hotfix Version 1.2.1\"\n$ .. fix bug\n$ git commit -m \"Fixed severe production problem\"\n\n$ git checkout master\n$ git merge --no-ff hotfix-1.2.1\n$ git tag -a 1.2.1\n\n# incude hotfix into develop\n$ git checkout develop\n$ git merge --no-ff hotfix-1.2.1\n\n# finally, remove hotfix branch\n$ git branch -d hotfix-1.2.1<\/pre>\n\n\n\n
Troubleshooting<\/h2>\n\n\n\n
Debugging Github Errors<\/h4>\n\n\n\n
export GIT_TRACE_PACKET=1\nexport GIT_TRACE=1\nexport GIT_CURL_VERBOSE=1<\/pre>\n\n\n\n
Error Message:  Your local changes to the following files would be overwritten by merge: <\/h4>\n\n\n\n
error: Your local changes to the following files would be overwritten by merge:<br>\n        README.md<br>\nPlease commit your changes or stash them before you merge.<\/pre>\n\n\n\n
Solution:<\/h4>\n\n\n\n
$ git fetch origin master\n$ git diff origin\/master -- [local-path]<\/pre>\n\n\n\n
$ git add [local-path]\n$ gt commit -m \"change: in file [local-path]\"<\/pre>\n\n\n\n
fatal: sha1 file ‘<stdout>’ write error: Broken Pipe <\/h4>\n\n\n\n
When using ssh to connect to the repositoriy, sometime, you got a timeout if you push to many files or if the files are to big<\/p>\n\n\n\n
One possible Solution<\/h4>\n\n\n\n
Configure ssh to use the following value<\/p>\n\n\n\n
~\/.ssh\/config<\/pre>\n\n\n\n
Host *\n     ServerAliveInterval 30\n     ServerAliveCountMax 4<\/pre>\n\n\n\n
git clone: file name to long on windows<\/h4>\n\n\n\n
git config --system core.longpaths true<\/pre>\n\n\n\n
git config –global user.email \u201csome@email.com\u201d throws \u201cerror: only one config file at a time.<\/h4>\n\n\n\n
Try to unset GIT_CONFIG and then list your global config with<\/p>\n\n\n\n
unset GIT_CONFIG\ngit config --global --list<\/pre>\n\n\n\n
Other Links<\/p>\n\n\n\n
Useful Git commands for everyday use<\/a><\/p>\n\n\n\n
10 useful Git commands you always need<\/a><\/p>\n\n\n\n
Most useful Git commands<\/a><\/p>\n\n\n\n
Git Cheat Sheet<\/a><\/p>\n\n\n\n
Useful Git commands<\/a><\/p>\n\n\n\n
Using local Filesystem as Respository-Master<\/h2>\n\n\n\n
Preparation<\/h4>\n\n\n\n
Set environment variables for easy typing<\/p>\n\n\n\n
$ REPOS=$HOME\/repos<\/pre>\n\n\n\n
Create Repository<\/h4>\n\n\n\n
$ mkdir $REPOS\n$ cd    $REPOS<\/pre>\n\n\n\n
$ git init --bare src<\/pre>\n\n\n\n
Create src folder<\/h4>\n\n\n\n
$ mkdir $HOME\/entw\n$ cd    $HOME\/entw\n$ mkdir src\n$ cd    src\n$ git init<\/pre>\n\n\n\n
Create some content<\/h4>\n\n\n\n
$ touch README.md<\/pre>\n\n\n\n
$ git add -A<\/pre>\n\n\n\n
$ git commit -m \"initial commit\"<\/pre>\n\n\n\n
$ git remote add origin $REPOS\/src\n$ git remote -v\n$ git push --set-upstream origin master\n$ git push origin master<\/pre>\n\n\n\n
Create clone<\/h4>\n\n\n\n
$ mkdir $HOME\/test\n$ cd    $HOME\/test<\/pre>\n\n\n\n
$ git clone $HOME\/repos\/src<\/pre>\n\n\n\n
$ cd src\n$ ls -al\ntotal 0\ndrwxr-xr-x   4 user  wheel  128 19 M\u00e4r 18:48 .\ndrwxr-xr-x   3 user  wheel   96 19 M\u00e4r 18:48 ..\ndrwxr-xr-x  12 user  wheel  384 19 M\u00e4r 18:48 .git\n-rw-r--r--   1 user  wheel    0 19 M\u00e4r 18:48 README.md<\/pre>\n\n\n\n
You will notice, that the file README.md is empty. Because it was ony created with touch.<\/p>\n\n\n\n
Add some content to source repository<\/h4>\n\n\n\n
$ cd $HOME\/entw\/src\n$ echo \"# This is the README.md from ENTW\" >README.md\n$ touch git_update\n$ touch git_push<\/pre>\n\n\n\n
$ ls -al\ntotal 16\ndrwxr-xr-x   6 user  wheel  192 19 M\u00e4r 18:53 .\ndrwxr-xr-x   3 user  wheel   96 19 M\u00e4r 18:43 ..\ndrwxr-xr-x  12 user  wheel  384 19 M\u00e4r 18:47 .git\n-rw-r--r--   1 user  wheel   34 19 M\u00e4r 18:52 README.md\n-rw-r--r--   1 user  wheel    0 19 M\u00e4r 18:53 git_push\n-rw-r--r--   1 user  wheel    0 19 M\u00e4r 18:53 git_update<\/pre>\n\n\n\n
Add changes to repository<\/h4>\n\n\n\n
$ git add -A\n$ git commit -m \"-\"\n[master 106b27a] -\n 3 files changed, 1 insertion(+)\n create mode 100644 git_push\n create mode 100644 git_update<\/pre>\n\n\n\n
$ git push --set-upstream origin master\nObjekte aufz\u00e4hlen: 5, Fertig.\nZ\u00e4hle Objekte: 100\nDelta-Kompression verwendet bis zu 8 Threads.\nKomprimiere Objekte: 100\nSchreibe Objekte: 100\nGesamt 3 (Delta 0), Wiederverwendet 0 (Delta 0)\nTo ....\/repos\/src\n   7ed6d3b..106b27a  master -> master\nBranch 'master' folgt nun Remote-Branch 'master' von 'origin'.<\/pre>\n\n\n\n
Update clone<\/h4>\n\n\n\n
$ cd $OME\/test\/src\n$ git pull\n# git fetch   # This updates 'remote' portion of local repo. \n# git reset --hard origin\/<your-working-branch>\nremote: Objekte aufz\u00e4hlen: 5, Fertig.\nremote: Z\u00e4hle Objekte: 100\nremote: Komprimiere Objekte: 100\nremote: Gesamt 3 (Delta 0), Wiederverwendet 0 (Delta 0)\nEntpacke Objekte: 100\nVon ...\/repos\/src\n   7ed6d3b..106b27a  master     -> origin\/master<\/pre>\n\n\n\n
$ git merge origin\/master\nAktualisiere 7ed6d3b..106b27a\nFast-forward\n README.md  | 1 +\n git_push   | 0\n git_update | 0\n 3 files changed, 1 insertion(+)\n create mode 100644 git_push\n create mode 100644 git_update<\/pre>\n\n\n\n
$ ls -al\ntotal 16\ndrwxr-xr-x   6 user  wheel  192 19 M\u00e4r 19:02 .\ndrwxr-xr-x   3 user  wheel   96 19 M\u00e4r 18:48 ..\ndrwxr-xr-x  14 user  wheel  448 19 M\u00e4r 19:02 .git\n-rw-r--r--   1 user  wheel   34 19 M\u00e4r 19:02 README.md\n-rw-r--r--   1 user  wheel    0 19 M\u00e4r 19:02 git_push\n-rw-r--r--   1 user  wheel    0 19 M\u00e4r 19:02 git_update<\/pre>\n\n\n\n
TODO<\/h2>\n\n\n\n
See changes before pulling from remote git repositoryf<\/strong><\/a><\/h4>\n\n\n\n
<\/tr><\/tr><\/tr><\/tr>
# fetch the changes from the remote<\/td><\/tr>
git fetch origin<\/td><\/tr>
# show commit logs of changes<\/td><\/tr>
git log master..origin\/master<\/td><\/tr>
# show diffs of changes<\/td><\/tr>
git diff master..origin\/master<\/td><\/tr>
# apply the changes by merge..<\/td><\/tr>
git merge origin\/master<\/td><\/tr>
# .. or just pull the changes<\/td><\/tr>
git pull<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
You want to push your local files to remote files<\/h4>\n\n\n\n
git push -f <remote> <branch><\/pre>\n\n\n\n
git push -f origin master<\/pre>\n\n\n\n
Configure Hooks<\/h3>\n\n\n\n
git config --global core.hooksPath .githooks\nmkdir .githooks\ncp .git\/hooks\/* .githooks<\/pre>\n\n\n\n
commit-msg<\/h4>\n\n\n\n
#!\/bin\/sh\n#\n\nNAME=$(git rev-parse --abbrev-ref HEAD) \nDESCRIPTION=$(git config branch.\"$NAME\".description)\n\necho \"$NAME\"': '$(cat \"$1\") > \"$1\"\nif [ -n \"$DESCRIPTION\" ] \nthen\n   echo \"\" >> \"$1\"\n   echo $DESCRIPTION >> \"$1\"\nfi<\/pre>\n\n\n\n
prepare-commit<\/h4>\n\n\n\n
#!\/bin\/sh\n#\n\nCOMMIT_MSG_FILE=$1\nCOMMIT_SOURCE=$2\nSHA1=$3\n\nbranchPath=$(git symbolic-ref -q HEAD)\nbranchName=${branchPath##*\/}\n\n\nif [ -n \"$branchName\" ]; then\n    echo \"$branchName | $(cat $1)\" > $1\nfi<\/pre>\n\n\n\n
file=$(git config hooks.versionfilename)\nif [[ -z $file ]]\nthen\n  file=\".version\"\nfi\n\n# Version number\necho \"$(git rev-parse --abbrev-ref HEAD): $(git describe --tags --long)\" >$file\n\nexec git add $file<\/pre>\n\n\n\n
pre-commit<\/h4>\n\n\n\n
#!\/bin\/sh\n\n_BRANCHPATH=$(git symbolic-ref -q HEAD)\n_BRANCHNAME=${_BRANCHPATH##*\/}\n\n_TIMESTAMP=\"$(date '+\n\necho \"HOOK      : $0\"\necho \"PARAMETER : '$*''\"\necho \"BRANCHPATH: $_BRANCHPATH\"\necho \"BRANCHNAME: $_BRANCHNAME\"\n\nLOG() {\n    [[ \"$GIT_COMMIT_DETAILED_LOGGING\" == \"YES\" ]] && echo \"LOG: $*\"\n}\n\nREPLACE()\n{\n   local _TYP;   _TYP=\"$1\"; shift\n   local _TAG;   _TAG=\"$1\"; shift\n   local _WITH; _WITH=\"$1\"; shift\n   local _FILE; _FILE=\"$1\"; shift\n\n   case \"$_TYP\" in\n      PYTHON)   perl -pi -e 's\/(\\s*)(__DEPLOY_'${_TAG}'\\s*=\\s*)(\".+\")\/${1}${2}\"'\"${_WITH}\"'\"\/' \"${_FILE}\"\n                ;;\n      *)        LOG \"Undefined typ '$TYP' for file $_FILE\"\n                ;;\n   esac\n\n   rm -f \"${_FILE}.bak\"\n}\n\nLOG \"working on branch $_BRANCH\"\n\nfor _FILE in $(git diff-index --name-status --cached HEAD | grep -v ^D | cut -c3-)\ndo\n    LOG \"checking: $_FILE\"\n\n    # Only examine known text files\n    if [[ \"$_FILE\" =~ [.](py)$ ]]; then\n        LOG \"patching: $_FILE\"\n\n        REPLACE PYTHON TAG       \"$_BRANCHNAME\" \"$_FILE\"\n        REPLACE PYTHON TIMESTAMP \"$_TIMESTAMP\"  \"$_FILE\"\n    fi\ndone\n<\/pre>\n\n\n\n
Get Information<\/h2>\n\n\n\n
git rev-parse –abbrev-ref HEAD<\/td>get branch name<\/td>feature\/add-new-content<\/td><\/tr>
git symbolic-ref -q HEAD<\/td><\/td>refs\/heads\/feature\/add-new-content<\/td><\/tr>
git rev-parse –show-toplevel<\/td>show current path of git repository<\/td><\/td><\/tr>
<\/td><\/td><\/td><\/tr>
<\/td><\/td><\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
<\/p>\n\n\n\n
Config<\/h2>\n\n\n\n
Change Github repository for local clone<\/h3>\n\n\n\n
cd <original repository>\ngit remote set-url origin https:\/\/github.com\/<new git user>\/<new project name>\ngit push -u origin master\n<\/pre>\n\n\n\n
CR\/LF Mapping<\/h3>\n\n\n\n
git config core.autocrlf true\ngit config --global core.safecrlf false<\/pre>\n\n\n\n
Create Release<\/h2>\n\n\n\n
#!\/bin\/bash\n\nif [ $# -ne 1 ]; then\n  echo \"Syntax: release [VERSION]\"\n  exit 1\nfi\n\nVERSION=$1\n\n# Create release\ngit flow release start $VERSION || exit 1\nGIT_MERGE_AUTOEDIT=no git flow release finish -m $VERSION $VERSION\n\n# Publish release\ngit push origin HEAD --tags\n\n# Merge release into develop\ngit checkout develop\ngit merge master<\/pre>\n","protected":false},"excerpt":{"rendered":"
Github hints Repository \u2014 Quick setup Clone repository .. or create a new repository on the command line \u2026or push an existing repository from the command line Merge branch with master Merging via command line Step 1: From your project repository, bring in the changes and test. Step 2: Merge the changes and update on GitHub. Useful commands To show information about a remote, for example if tracked branches are up-to-date: To show log messages of the changes between branches: Show log graph To show differences between branches: Show , what git pull will doing Or add the command to ~\/.gitconfig […]<\/p>\n","protected":false},"author":1,"featured_media":4300,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_crdt_document":"","_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[16,28],"tags":[],"class_list":["post-4433","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-cookbook","category-git_github"],"jetpack_featured_media_url":"https:\/\/via-internet.de\/blog\/wp-content\/uploads\/2019\/03\/Logo-Github.png","jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/posts\/4433","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/comments?post=4433"}],"version-history":[{"count":4,"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/posts\/4433\/revisions"}],"predecessor-version":[{"id":9010,"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/posts\/4433\/revisions\/9010"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/media\/4300"}],"wp:attachment":[{"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/media?parent=4433"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/categories?post=4433"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/via-internet.de\/blog\/wp-json\/wp\/v2\/tags?post=4433"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}