Устранён конфликт с git-extras

This commit is contained in:
Andrei Astafev 2021-07-13 19:24:51 +03:00
parent dc18397ffd
commit 8ca2a09939

9
config
View File

@ -83,9 +83,6 @@
# Get object type # Get object type
type = cat-file -t type = cat-file -t
# Get file info
info = cat-file -p
# Show commit logs # Show commit logs
logs = !git shortlog --summary | sort --reverse --numeric-sort logs = !git shortlog --summary | sort --reverse --numeric-sort
@ -104,9 +101,6 @@
# Remove files which have been deleted # Remove files which have been deleted
remove = !git ls-files -z --deleted | xargs -0 git rm remove = !git ls-files -z --deleted | xargs -0 git rm
# Ignore a file
ignore = !([ ! -e .gitignore ] && touch .gitignore) | echo $1 >> .gitignore
# Assume a file as unchanged # Assume a file as unchanged
assume = !git update-index --assume-unchanged assume = !git update-index --assume-unchanged
@ -116,9 +110,6 @@
# Show assumed files # Show assumed files
assumed = !git ls-files -v | grep ^h | cut -c 3- assumed = !git ls-files -v | grep ^h | cut -c 3-
# Pull from remote repository
fork = !git config --get remote.origin.url | xargs git pull
# Delete multiple branches # Delete multiple branches
#git branch -D `git for-each-ref --format="%(refname:short)" refs/heads/...` #git branch -D `git for-each-ref --format="%(refname:short)" refs/heads/...`