clone of my dotfiles.ssp.sh
updated my git workflow
+69
-1
+1
Brewfile
+1
Brewfile
+1
backup_dotfiles.sh
+1
backup_dotfiles.sh
···
8
8
cp -r ~/.config/nvim/themes $git/general/dotfiles/nvim/themes
9
9
cp -r ~/.config/nvim/autoload $git/general/dotfiles/nvim/autoload
10
10
cp -r ~/.aliases.shrc $git/general/dotfiles/zsh/aliases.shrc
11
+
cp -r ~/.gitconfig $git/general/dotfiles/git/gitconfig
11
12
12
13
cp -r ~/.tmux.conf $git/general/dotfiles/tmux/tmux.conf
13
14
cp -r ~/.tmux/ $git/general/dotfiles/tmux/
+49
git/gitconfig
+49
git/gitconfig
···
1
+
[user]
2
+
name = sspaeti
3
+
[github]
4
+
user = sspaeti
5
+
[core]
6
+
excludesfile = /Users/sspaeti/.gitignore_global
7
+
[difftool "sourcetree"]
8
+
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
9
+
path =
10
+
[mergetool "sourcetree"]
11
+
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
12
+
trustExitCode = true
13
+
[difftool "nvimdiff"]
14
+
cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
15
+
path =
16
+
[mergetool "nvimdiff"]
17
+
cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
18
+
trustExitCode = true
19
+
[commit]
20
+
template = /Users/sspaeti/.stCommitMsg
21
+
[filter "lfs"]
22
+
clean = git-lfs clean -- %f
23
+
smudge = git-lfs smudge -- %f
24
+
process = git-lfs filter-process
25
+
required = true
26
+
[alias]
27
+
#ga = "!git status --short | peco | awk '{print $2}' | xargs git add"
28
+
#gd = diff
29
+
co = checkout
30
+
ci = commit
31
+
ca = commit -a
32
+
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
33
+
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
34
+
st = status
35
+
br = branch
36
+
ba = branch -a
37
+
bm = branch --merged
38
+
bn = branch --no-merged
39
+
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}"
40
+
hist = log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all
41
+
llog = log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative
42
+
open = "!hub browse"
43
+
type = cat-file -t
44
+
dump = cat-file -p
45
+
find = "!f() { git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative -S'pretty' -S\"$@\" | peco | awk '{print $1}' | xargs -I {} git diff {}^ {}; }; f"
46
+
# edit conflicted file on merge
47
+
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
48
+
# add conflicted file on merge
49
+
add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
+18
-1
zsh/aliases.shrc
+18
-1
zsh/aliases.shrc
···
5
5
export EDITOR="nvim"
6
6
alias vim=nvim
7
7
8
+
# that pip install strawberry-graphql[debug-server] will not fail (square brackets are used for globbing: https://stackoverflow.com/a/30539963/5246670)
9
+
alias pip='noglob pip'
10
+
alias ide=~/.tmux/ide
11
+
alias tmux-session=~/.tmux/tmux-session
12
+
13
+
8
14
#git shortcuts
15
+
alias g='git'
9
16
alias ga='git add'
10
17
alias gp='git push'
11
18
alias gl='git log'
···
15
22
alias gm='git commit -m'
16
23
alias gma='git commit -am'
17
24
alias gb='git branch'
18
-
alias gc='git checkout'
25
+
alias gco='git checkout'
19
26
alias gra='git remote add'
20
27
alias grr='git remote rm'
21
28
alias gpu='git pull'
22
29
alias gf='git fetch'
23
30
alias gcl='git clone'
31
+
32
+
#alias ghist = log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all
33
+
alias ghist = log --pretty=format:\"%Cgreen%h %Creset%cd %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all
34
+
#alias gllog = log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative
35
+
alias gopen = "!hub browse"
36
+
alias gfind = "!f() { git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative -S'pretty' -S\"$@\" | peco | awk '{print $1}' | xargs -I {} git diff {}^ {}; }; f"
37
+
# edit conflicted file on merge
38
+
alias gedit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
39
+
# add conflicted file on merge
40
+
alias gadd-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
24
41
25
42
#docker
26
43
alias dkps="docker ps"