Fix return code of main and avoid rebase in make sync
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
|
||||
# Updated: 2022/04/23 23:52:03 by gbaconni ### lausanne.ch #
|
||||
# Updated: 2022/04/24 11:25:04 by gbaconni ### lausanne.ch #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
#
|
||||
@@ -142,19 +142,18 @@ ft:
|
||||
@echo "functions:"
|
||||
@nm $(NAME) | grep T | grep -o 'ft_.*' | sort -u
|
||||
|
||||
sync: config online fetch
|
||||
sync: config online pull
|
||||
@git status | grep -q 'nothing to commit' || (git diff; read -p "Comment: " comment; git add -A; git commit -am "$${comment-$$(date '+%F %T')}"; git push)
|
||||
|
||||
online:
|
||||
@dig +short vogsphere.42lausanne.ch A | grep -qF '185.25.195.180' || echo 'vogsphere.42lausanne.ch unresolvable'
|
||||
@nc -vzw3 vogsphere.42lausanne.ch 443 2>&1 | grep -qF 'succeeded' || echo 'vogsphere.42lausanne.ch unreachable'
|
||||
@nc -vzw3 vogsphere.42lausanne.ch 443 2>&1 | grep -qF '185.25.195.180' || echo 'vogsphere.42lausanne.ch unreachable'
|
||||
|
||||
fetch:
|
||||
@git fetch
|
||||
pull:
|
||||
@git pull
|
||||
|
||||
config:
|
||||
@git config user.name "gbaconni"
|
||||
@git config user.email "gbaconni@student.42lausanne.ch"
|
||||
@git config pull.rebase true
|
||||
@git config branch.autosetuprebase always
|
||||
@git config pull.rebase false
|
||||
|
||||
|
||||
Reference in New Issue
Block a user