Better Git configuration

#1

Post by scottnonnenberg » Wed, Apr 05, 2017, 9:28 PM UTC

Better Git configuration
blog.scottnonnenberg.com

Re: Better Git configuration

#2

Post by mi100hael » Wed, Apr 05, 2017, 11:22 PM UTC

Some good tips in here. I also like to add the following alias to give me a more condensed log with graph & tags:

    hist = log --pretty=format:\"%C(yellow)%h%C(reset) %C(green)%ad%C(reset) %C(red)|%C(reset) %s %C(bold blue)[%an]%C(reset)%C(yellow)%d%C(reset)\" --graph --date=short

Re: Better Git configuration

#3

Post by pavel_lishin » Wed, Apr 05, 2017, 11:38 PM UTC

mi100hael wrote: post #2

Some good tips in here. I also like to add the following alias to give me a more condensed log with graph & tags: hist = log --pretty=format:\"%C(yellow)%h%C(reset) %C(green)%ad%C(reset) %C(red)|%C(reset) %s %C(bold blue)[%an]%C(reset)%C(yellow)%d%C(reset)\" --graph --date=short

I have a similar one:

    lg2 = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen%cn%Creset %Cblue(%cr)%Creset' --abbrev-commit --date=relative

Shows dates at the end, in a relative format (2 days ago, 29 hours ago, etc) and the tags/branches before the commit message.

Re: Better Git configuration

#4

Post by nichochar » Thu, Apr 06, 2017, 12:01 AM UTC

pavel_lishin wrote: post #3

mi100hael wrote: post #2

Some good tips in here. I also like to add the following alias to give me a more condensed log with graph & tags: hist = log --pretty=format:\"%C(yellow)%h%C(reset) %C(green)%ad%C(reset) %C(red)|%C(reset) %s %C(bold blue)[%an]%C(reset)%C(yellow)%d%C(reset)\" --graph --date=short

I have a similar one: lg2 = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen%cn%Creset %Cblue(%cr)%Creset' --abbrev-commit --date=relative Shows dates at the end, in a relative format (2 days ago, 29 hours ago, etc) and the tags/branches before the commit message.

So do I! lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)%Creset' --abbrev-commit

Re: Better Git configuration

#5

Post by [deleted] » Thu, Apr 06, 2017, 12:05 AM UTC

[deleted]

Re: Better Git configuration

#6

Post by rajathagasthya » Thu, Apr 06, 2017, 12:17 AM UTC

Nice post. I didn't know about the followTags = true until now and I'm using it in my .gitconfig.

Re: Better Git configuration

#7

Post by ymse » Thu, Apr 06, 2017, 12:37 AM UTC

Oddly, the author recommends signing commits, yet uses only fast-forward merges. Little do they know that signed commits necessarily can not be resolved as fast-forwards in a merge situation, since that would require changing the signatures!

Rebasing is the answer, but that will of course re-sign every commit with your key. In a shared repository, I prefer creating "useless" merge commits to changing other peoples signatures.

Re: Better Git configuration

#8

Post by scottnonnenberg » Thu, Apr 06, 2017, 12:43 AM UTC

ymse wrote: post #7

Oddly, the author recommends signing commits, yet uses only fast-forward merges. Little do they know that signed commits necessarily can not be resolved as fast-forwards in a merge situation, since that would require changing the signatures! Rebasing is the answer, but that will of course re-sign every commit with your key. In a shared repository, I prefer creating "useless" merge commits to changing other peoples si…

My local configuration doesn't need to be ready to create merge commits because those happen on GitHub/GitLab/etc. When I rebase, it's my own pull request on top of a more recent master - the signer remains me.

Re: Better Git configuration

#9

Post by jph » Thu, Apr 06, 2017, 12:48 AM UTC

Many git alias ideas: https://github.com/gitalias

Improvements and pull requests are welcome.

Re: Better Git configuration

#10

Post by scrollaway » Thu, Apr 06, 2017, 12:53 AM UTC

I want to also recommend the following:

git config --global stash.showPatch true: A recent addition to git which defaults the -p flag to `git stash show`; meaning `git stash show` shows the diff from that stash (should really be default...)

git config --global rebase.autostash true: will automatically stash and unstash the working directory before and after rebases. This makes it possible to rebase with changes in the repo.

git config --global log.decorate full: Always decorate `git log`