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

config

@@ -83,9 +83,6 @@
 	# Get object type
 	type         = cat-file -t
 
-	# Get file info
-	info         = cat-file -p
-
 	# Show commit logs
 	logs         = !git shortlog --summary | sort --reverse --numeric-sort
 
@@ -104,9 +101,6 @@
 	# Remove files which have been deleted
 	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       = !git update-index --assume-unchanged
 
@@ -116,9 +110,6 @@
 	# Show assumed files
 	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
 	#git branch -D `git for-each-ref --format="%(refname:short)" refs/heads/...`