git - Digital Craftsman

Digital Craftsman

Sign in Subscribe

git

A collection of 16 posts

Check for git changes with bash

Check for git changes with bash

When running a deployment, I want to make sure, that all changes have been committed to git before it's executed. There is a special flag --porcelain for the git status command which does exactly this check. Wrap this in an if command and you're good to

Changing git commit message after push

Changing git commit message after push

You know the feeling when you just pushed a commit to the remote and realize you've got a typo or some information missing in your commit message? There is a fix for that. Not for the feeling itself, but at least for the message. You can update it

Remove file from git history

Remove file from git history

Switching from Bitbucket to Github had one hickup I didn't expect. On Github the maximal file size is 100MB. On Bitbucket it's higher and I had a video with over 345MB in my repository. But only at the beginning. As it's still part of

How to squash already pushed commits

When working on a pull requests it happens more often then not, that you have to push multiple commits to one pull request. Of course you don't want to have all of them in the master, so what do you do? You squash them. That's not

Global .gitignore

When you're working with git, there are many types of files which you will want to ignore in every single git project. System files like .DS_Store or IDE files/folders like .idea. Those files are more related to your system then your project and should therefore be

Show changed files with diff of branches

With the command git diff targetbranch you can see all changes from one branch to another. But sometimes you only want to see the files changed, not the actual changes. For this there is a extra flag called --name-only: $ git diff --name-only master

Git amend user

When you want to change the last commit you can use git --amend to change the commit message or the files included. When you want to update the user information, you have to use it directly in the call. git commit --amend --author="Name <name@domain.tld>

Git show parent branch

When using multiple git branches it can happen, that you loose track of which branch tracks which other. Or maybe even whether branches track any branch. Here [http://stackoverflow.com/questions/4950725/how-do-i-get-git-to-show-me-which-branches-are-tracking-what] is a nice little script to show the ones that track another remote branch and which: git

Git autocorrect

Did you know that there is an autocorrect feature within git? It automatically correct (and execute) things like git stats to git status. By default this feature is disabled. To enable it enter the following command: $ git config --global help.autocorrect -1 From the documentation: > Automatically correct and execute

Reset local git branch

Sometimes it happens that you mess up your local git repository or just have to many changes you don't need any more. There is a simple way to reset your local git repository to the connected origin branch: $ git reset --hard origin/master In this case you would

Git bash auto completion on linux

Wouldn't it be nice to have autocomplete for git on your console when working with linux? And of course there is. Insert the following into your ~/.bashrc or ~/.profile: source /etc/bash_completion.d/git if [ -f /etc/bash_completion ]; then . /etc/bash_completion fi For more informationen

Rename a local git branch on console

To rename any local branch: $ git branch -m oldname newname Or if you want to rename the current branch: $ git branch -m newname

Git commit with title and message on console

When using a graphical git tool like Tower, you can enter a title and a description to each commit. On the console it's not that obvious how to enter a description. But if you know how, it's really easy: $ git commit -m "Title" -m

Fast way to delete local git branches on cosole

When working on tickets I create a separate git branch for each ticket. That's great for organization, but the overview suffers after a while with way to many branches. I found a nice and fast way to remove all but the current branch for cleanup. Just enter the

Git undo assume-unchanged

Did you ever just mark a file as assume-unchanged and wanted to take that back? I searched a long time until I found this question on stackoverflow: https://stackoverflow.com/questions/17195861/undo-a-git-update-index-assume-unchanged-file In short: git update-index --no-assume-unchanged <file>

Composer installation without github.com

Awesome description how to setup a installation without having to depend on github or packagist. Composer installation without github.com [http://tech.m6web.fr/composer-installation-without-github.html]