Mikaela/shell-things
1
0
Fork 0
mirror of https://gitea.blesmrt.net/mikaela/shell-things.git synced 2024-11-22 03:09:22 +01:00
Code Issues Projects Releases Wiki Activity

gitconfig: sort aliases & add mergen & pulln

Browse Source 
git merge & git pull with --no-ff
This commit is contained in:
Mikaela Suomalainen 2014-10-08 23:28:16 +03:00
parent e95b5fa006
commit 5afe3a716b
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitconfig.MKAYSIGREP
View File

@ -3,12 +3,15 @@
email = mikaela.suomalainen@outlook.com email = mikaela.suomalainen@outlook.com
signingkey = 0xDAA6CA08F2E96AC7 signingkey = 0xDAA6CA08F2E96AC7
[alias] [alias]
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
# From http://progit.org/book/ch2-7.html
last = cat-file commit HEAD
cleandi = clean -di cleandi = clean -di
cleandix = clean -dix cleandix = clean -dix
# From http://progit.org/book/ch2-7.html
last = cat-file commit HEAD
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
mergen = merge --no-ff
pulln = pull --no-ff
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
[core] [core]
editor = vim editor = vim
autocrlf = input autocrlf = input

11
gitconfig
View File

@ -3,12 +3,15 @@
# email = mikaela.suomalainen@outlook.com # email = mikaela.suomalainen@outlook.com
# signingkey = 0xDAA6CA08F2E96AC7 # signingkey = 0xDAA6CA08F2E96AC7
[alias] [alias]
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
# From http://progit.org/book/ch2-7.html
last = cat-file commit HEAD
cleandi = clean -di cleandi = clean -di
cleandix = clean -dix cleandix = clean -dix
# From http://progit.org/book/ch2-7.html
last = cat-file commit HEAD
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
mergen = merge --no-ff
pulln = pull --no-ff
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
[core] [core]
editor = vim editor = vim
autocrlf = input autocrlf = input