mirror of
https://github.com/captn3m0/dotfiles.git
synced 2024-09-27 19:22:50 +00:00
[git] Adds a gitconfig alias for fetch and rebase
This commit is contained in:
parent
31c26d9e6e
commit
40339ae277
2
files/display/.screenlayout/office_left_only.sh
Executable file
2
files/display/.screenlayout/office_left_only.sh
Executable file
@ -0,0 +1,2 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
xrandr --output HDMI2 --mode 1920x1080 --pos 0x0 --rotate normal --output HDMI1 --off --output DP1 --off --output eDP1 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output VIRTUAL1 --off
|
@ -2,8 +2,10 @@
|
|||||||
name = Abhay Rana
|
name = Abhay Rana
|
||||||
email = me@captnemo.in
|
email = me@captnemo.in
|
||||||
signingkey = B8963685
|
signingkey = B8963685
|
||||||
|
|
||||||
[github]
|
[github]
|
||||||
user = captn3m0
|
user = captn3m0
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
rod = rebase origin/development
|
rod = rebase origin/development
|
||||||
rom = rebase origin/master
|
rom = rebase origin/master
|
||||||
@ -17,13 +19,17 @@
|
|||||||
fo = fetch origin
|
fo = fetch origin
|
||||||
co = checkout
|
co = checkout
|
||||||
ci = commit
|
ci = commit
|
||||||
|
from = "! git fetch origin; git rebase origin/master"
|
||||||
|
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
branch = auto
|
branch = auto
|
||||||
diff = auto
|
diff = auto
|
||||||
status = auto
|
status = auto
|
||||||
ui = true
|
ui = true
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
l50 = "!git log --abbrev-commit --date=short --pretty=format:'%x00%h%x00%cd%x00%s%x00%an%x00%d' | gawk -F '\\0' '{ printf \"%s\\033[31m%s\\033[0m \\033[32m%s\\033[0m %-50s \\033[30;1m%s\\033[0m\\033[33m%s\\n\", $1, $2, $3, gensub(/(.{49}).{2,}/, \"\\\\1…\",\"g\",$4), $5, $6 }' | less -R"
|
l50 = "!git log --abbrev-commit --date=short --pretty=format:'%x00%h%x00%cd%x00%s%x00%an%x00%d' | gawk -F '\\0' '{ printf \"%s\\033[31m%s\\033[0m \\033[32m%s\\033[0m %-50s \\033[30;1m%s\\033[0m\\033[33m%s\\n\", $1, $2, $3, gensub(/(.{49}).{2,}/, \"\\\\1…\",\"g\",$4), $5, $6 }' | less -R"
|
||||||
l80 = "!git log --abbrev-commit --date=short --pretty=format:'%x00%h%x00%cd%x00%s%x00%an%x00%d' | gawk -F '\\0' '{ printf \"%s\\033[31m%s\\033[0m \\033[32m%s\\033[0m %-80s \\033[30;1m%s\\033[0m\\033[33m%s\\n\", $1, $2, $3, gensub(/(.{79}).{2,}/, \"\\\\1…\",\"g\",$4), $5, $6 }' | less -R"
|
l80 = "!git log --abbrev-commit --date=short --pretty=format:'%x00%h%x00%cd%x00%s%x00%an%x00%d' | gawk -F '\\0' '{ printf \"%s\\033[31m%s\\033[0m \\033[32m%s\\033[0m %-80s \\033[30;1m%s\\033[0m\\033[33m%s\\n\", $1, $2, $3, gensub(/(.{79}).{2,}/, \"\\\\1…\",\"g\",$4), $5, $6 }' | less -R"
|
||||||
@ -32,13 +38,16 @@
|
|||||||
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(blue)(%an <%ae>)%Creset' --abbrev-commit --date=relative
|
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(blue)(%an <%ae>)%Creset' --abbrev-commit --date=relative
|
||||||
[help]
|
[help]
|
||||||
autocorrect = 10
|
autocorrect = 10
|
||||||
|
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
|
|
||||||
[color "diff-highlight"]
|
[color "diff-highlight"]
|
||||||
oldNormal = red bold
|
oldNormal = red bold
|
||||||
oldHighlight = red bold 52
|
oldHighlight = red bold 52
|
||||||
newNormal = green bold
|
newNormal = green bold
|
||||||
newHighlight = green bold 22
|
newHighlight = green bold 22
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
# https://github.com/so-fancy/diff-so-fancy
|
# https://github.com/so-fancy/diff-so-fancy
|
||||||
pager = diff-so-fancy | less --tabs=4 -RFX
|
pager = diff-so-fancy | less --tabs=4 -RFX
|
||||||
|
Loading…
Reference in New Issue
Block a user