Compare commits

..

No commits in common. "1c49ca503aa49710a2ce2fb02d79ab86587a3f5f" and "037c5a13c36d617648db0ddccb8041d7b1f7deb0" have entirely different histories.

2 changed files with 1 additions and 2 deletions

View file

@ -16,7 +16,6 @@
ff = only ff = only
[url "git@github.com:"] [url "git@github.com:"]
pushInsteadOf = https://github.com/ pushInsteadOf = https://github.com/
insteadOf = https://github.com/
[url "git@gitlab.com:"] [url "git@gitlab.com:"]
pushInsteadOf = https://gitlab.com/ pushInsteadOf = https://gitlab.com/
[url "git@gitlab.adhoc-gti.com:"] [url "git@gitlab.adhoc-gti.com:"]
@ -41,7 +40,7 @@
save = !git add -A && git commit -m 'SAVEPOINT' save = !git add -A && git commit -m 'SAVEPOINT'
undo = reset HEAD~1 --mixed undo = reset HEAD~1 --mixed
backup = !git push origin/backup/$(whoami)/$(git branch) backup = !git push origin/backup/$(whoami)/$(git branch)
lint = !git branch --merged ${1-} | grep -v -E -e '^[*]?[ ]*(main|master|[0-9]+[.]([0-9]+|x)-stable)$' -e '^[*][ ]+' | xargs -r -n 1 git branch -d lint = !git branch --merged | grep -v \"^\\s*master$\" | grep -v \"\\*\" | xargs -n 1 git branch -d
modified = !git status --porcelain | perl -ne '/^M (.*)/ and print \"$1\\n\"' modified = !git status --porcelain | perl -ne '/^M (.*)/ and print \"$1\\n\"'
conflicts = !git status --porcelain | perl -ne '/^UU (.*)/ and print \"$1\\n\"' conflicts = !git status --porcelain | perl -ne '/^UU (.*)/ and print \"$1\\n\"'
fetch-pr = !git fetch origin pull/${1}/head:pr/${1} fetch-pr = !git fetch origin pull/${1}/head:pr/${1}

0
shell/docker Normal file → Executable file
View file