diff --git a/.bashrc.swp b/.bashrc.swp new file mode 100644 index 0000000..76dce10 Binary files /dev/null and b/.bashrc.swp differ diff --git a/.gitconfig b/.gitconfig index 8189d3a..8b8df49 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,29 +7,54 @@ [alias] cg = config --global - aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g' - ci = commit + co = checkout st = status - lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset' + f = fetch + + m = merge + ma = merge --abort + mc = merge --continue + + lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset' --abbrev-commit --decorate=full + aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g' + oops = commit --amend --no-edit + + p = push pfl = push --force-with-lease - adda = add --a + + rh = git reset --hard HEAD~1 + rs = git reset --soft HEAD~1 uncommit = reset --soft HEAD~1 untrack = rm --cache -- + unstage = reset -- + rb = rebase rbc = rebase --continue rba = rebase --abort rbi = rebase --interactive origin/main + + adda = add --a + ci = commit cim = commit -m cima = commit -a -m + br = branch bra = branch -a + brd = branch -d + brdd = branch -D -[fetch] - prune = true - pruneTags = True + cp = cherry-pick + cpa = cherry-pick --abort + cpc = cherry-pick --continue + + s = stash + sp = stash pop + sa = stash apply + sd = stash drop all = true + [pull] rebase = true [push]