Skip to content

Commit

Permalink
git
Browse files Browse the repository at this point in the history
  • Loading branch information
thiagowfx committed Apr 30, 2024
1 parent fd48fec commit c4516b1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
13 changes: 7 additions & 6 deletions git/.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
email = [email protected]

# This setup will always prompt for the password.
# There's also https://aur.archlinux.org/packages/git-sendgmail-git/ for an OAuth2-based setup with Gmail.
# https://git-scm.com/docs/git-send-email
# https://git-send-email.io/
[sendemail]
Expand All @@ -14,22 +13,22 @@
smtpUser = [email protected]

[alias]
# keep-sorted start
cp = cherry-pick
dc = diff --cached
desc = commit --allow-empty
emerge = !git amend -n && git pushm -f
exec = !exec
nb = checkout -b
rbi = rebase -i HEAD~10
pullm = !git pull $(git remote) $(git branch --show-current):$(git branch --show-current)
pushm = !git push $(git remote) $(git branch --show-current):$(git branch --show-current)
rb = branch -m
rbi = rebase -i HEAD~10
rc = rebase --continue
st = status
su = submodule update
world = !git fetch --all && git remote prune origin

# m = matching
pushm = !git push $(git remote) $(git branch --show-current):$(git branch --show-current)
pullm = !git pull $(git remote) $(git branch --show-current):$(git branch --show-current)
# keep-sorted end

# usage: git ignore go,hugo,vim >> .gitignore
ignore = !curl -L -s https://www.gitignore.io/api/$@
Expand All @@ -39,6 +38,7 @@
xl = branch -vv

# hg/fig compatibility
# keep-sorted start
amend = commit --amend --no-edit
purge = clean -f -d
recommit = commit --reedit-message ORIG_HEAD
Expand All @@ -48,6 +48,7 @@
uncommit = !git reset --soft HEAD^ && git restore --staged .
unshelve = stash apply
unstash = stash apply
# keep-sorted end

[apply]
# Detect whitespace errors when applying a patch.
Expand Down
2 changes: 1 addition & 1 deletion git/.mrconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

[DEFAULT]
git_world = git world "$@"
git_xl = git xl "$@" && gh pr list --author "@me"
git_xl = git xl "$@"

0 comments on commit c4516b1

Please sign in to comment.