refactor: combine with Ubuntu Provisioning repo
Combine with this repository with https://github.com/opdavies/ubuntu-provisioning so that everything can be managed in one place, and add a role for each piece of software.
This commit is contained in:
parent
e11cf61218
commit
8916e90050
73 changed files with 239 additions and 3783 deletions
133
roles/git/files/.gitconfig
Normal file
133
roles/git/files/.gitconfig
Normal file
|
@ -0,0 +1,133 @@
|
|||
[alias]
|
||||
aa = add --all
|
||||
assume = update-index --assume-unchanged
|
||||
assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3-
|
||||
b = branch
|
||||
browse = !hub browse
|
||||
ca = commit --amend --verbose
|
||||
car = commit --amend --no-edit
|
||||
cl = !hub clone
|
||||
cl = !hub clone
|
||||
co = checkout
|
||||
compare = !hub compare
|
||||
current-branch = rev-parse --abbrev-ref HEAD
|
||||
dc = diff --color --word-diff --cached
|
||||
df = diff --color --word-diff
|
||||
dup = !git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -
|
||||
fixup = commit --fixup
|
||||
issues = !hub browse -- issues
|
||||
mup = !git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -
|
||||
nah = !git reset --hard && git clean -fd
|
||||
no-ff = merge --no-ff
|
||||
pl = pull
|
||||
prune = remote prune origin
|
||||
ps = push
|
||||
pulls = !hub browse -- pulls
|
||||
rbc = rebase --continue
|
||||
rdup = !git dup && git rebase develop
|
||||
remotes = remote -v
|
||||
repush = !git pull --rebase && git push
|
||||
ri = rebase --interactive
|
||||
rid = !git rebase -i $(git merge-base develop HEAD)
|
||||
rim = !git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)
|
||||
rip = !git rebase -i $(git merge-base production HEAD)
|
||||
ris = !git rebase -i $(git merge-base staging HEAD)
|
||||
riu = !git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
|
||||
rmup = !git mup && git master-to-main-wrapper rebase %BRANCH%
|
||||
sl = log --oneline --decorate -20
|
||||
sla = log --oneline --decorate --graph --all -20
|
||||
slap = log --oneline --decorate --graph --all
|
||||
slp = log --oneline --decorate
|
||||
staged = diff --staged
|
||||
unassume = update-index --no-assume-unchanged
|
||||
uncommit = reset --soft HEAD^
|
||||
unstage = reset
|
||||
upstream = rev-parse --abbrev-ref --symbolic-full-name @{u}
|
||||
ureset = !git reset --hard $(git upstream)
|
||||
wip = !git add . && git commit -m 'wip'
|
||||
|
||||
[branch]
|
||||
autosetupmerge = true
|
||||
autosetuprebase = always
|
||||
|
||||
[checkout]
|
||||
defaultRemote = origin
|
||||
|
||||
[color]
|
||||
branch = auto
|
||||
diff = auto
|
||||
status = auto
|
||||
ui = true
|
||||
|
||||
[color "branch"]
|
||||
current = red reverse
|
||||
local = blue
|
||||
remote = green
|
||||
|
||||
[color "diff"]
|
||||
meta = yellow
|
||||
frag = magenta
|
||||
old = red bold
|
||||
new = green
|
||||
plain = white
|
||||
|
||||
[color "status"]
|
||||
added = yellow
|
||||
changed = green
|
||||
untracked = cyan
|
||||
|
||||
[commit]
|
||||
template = ~/.gitmessage
|
||||
verbose = true
|
||||
|
||||
[core]
|
||||
editor = nvim
|
||||
excludesFile = ~/.gitignore-global
|
||||
|
||||
[diff]
|
||||
tool = vimdiff
|
||||
|
||||
[fetch]
|
||||
prune = true
|
||||
|
||||
[gitsh]
|
||||
nogreeting = true
|
||||
|
||||
[grep]
|
||||
lineNumber = true
|
||||
|
||||
[help]
|
||||
autocorrect = 1
|
||||
|
||||
[include]
|
||||
path = ~/.gitconfig.local
|
||||
|
||||
[init]
|
||||
templatedir = ~/.git_template
|
||||
|
||||
[merge]
|
||||
ff = only
|
||||
|
||||
[rebase]
|
||||
autosquash = true
|
||||
autostash = true
|
||||
|
||||
[rerere]
|
||||
enabled = true
|
||||
|
||||
[push]
|
||||
default = upstream
|
||||
|
||||
[url "https://git.drupal.org/project/"]
|
||||
insteadOf = do:
|
||||
insteadOf = drupal:
|
||||
|
||||
[pull]
|
||||
ff = only
|
||||
rebase = true
|
||||
|
||||
[filter "lfs"]
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
10
roles/git/files/.gitignore
vendored
Normal file
10
roles/git/files/.gitignore
vendored
Normal file
|
@ -0,0 +1,10 @@
|
|||
*
|
||||
!*/
|
||||
!/bin/**
|
||||
!/tag-*/**
|
||||
/tag-php/composer/.env
|
||||
/tag-php/composer/auth.json
|
||||
/tag-php/composer/bin/
|
||||
/tag-php/composer/config/
|
||||
/tag-php/composer/keys.*.pub
|
||||
/**/*.zwc
|
43
roles/git/files/.gitignore-global
Normal file
43
roles/git/files/.gitignore-global
Normal file
|
@ -0,0 +1,43 @@
|
|||
# Ignore archive files.
|
||||
*.7z
|
||||
*.dmg
|
||||
*.gz
|
||||
*.iso
|
||||
*.phar
|
||||
*.phar.version
|
||||
*.rar
|
||||
*.tar
|
||||
*.zip
|
||||
|
||||
# Ignore database exports.
|
||||
*.*sql
|
||||
|
||||
# Ignore patch files and interdiffs.
|
||||
*.patch
|
||||
*.diff
|
||||
*.rej
|
||||
*.orig
|
||||
interdiff*.txt
|
||||
|
||||
# Ignore Vagrant directories.
|
||||
.vagrant/
|
||||
|
||||
# Ignore logs.
|
||||
*.log
|
||||
|
||||
# Ignore IDE and text editor files.
|
||||
.idea/
|
||||
*.sublime-*
|
||||
|
||||
# Ignore temporary directories.
|
||||
.php_cs.cache
|
||||
tmp/
|
||||
|
||||
# Ignore Ansible Playbook retrys.
|
||||
*.retry
|
||||
|
||||
# Ignore notes within projects.
|
||||
.notes/
|
||||
|
||||
# Ignore directory level aliases
|
||||
.aliases
|
16
roles/git/files/.gitmessage
Normal file
16
roles/git/files/.gitmessage
Normal file
|
@ -0,0 +1,16 @@
|
|||
|
||||
|
||||
# 50-character subject line
|
||||
#
|
||||
# 72-character wrapped longer description. This should answer:
|
||||
#
|
||||
# * Why was this change necessary?
|
||||
# * How does it address the problem?
|
||||
# * Are there any side effects?
|
||||
#
|
||||
# Include a link to the ticket, if any.
|
||||
#
|
||||
# Add co-authors if you worked on this code with others:
|
||||
#
|
||||
# Co-authored-by: Full Name <email@example.com>
|
||||
# Co-authored-by: Full Name <email@example.com>
|
Loading…
Add table
Add a link
Reference in a new issue