|
|
@ -7,7 +7,7 @@ |
|
|
|
alias = !git config -l | grep '^alias\\.' | cut -d '.' -f '2-' | sed -r -e 's/=/ = /' | sort |
|
|
|
alias = !git config -l | grep '^alias\\.' | cut -d '.' -f '2-' | sed -r -e 's/=/ = /' | sort |
|
|
|
amend = commit --amend |
|
|
|
amend = commit --amend |
|
|
|
amend-a = commit -a --amend |
|
|
|
amend-a = commit -a --amend |
|
|
|
chmod = "!f() { chmod_flag=$1 && shift && cd -- \"${GIT_PREFIX:-.}\"; git add --chmod=\"$chmod_flag\" \"$@\" && chmod \"$chmod_flag\" \"$@\"; }; f" |
|
|
|
chmod = "!f() { chmod_flag=$1 && shift && git add --chmod=$chmod_flag $@ && chmod $chmod_flag $@; }; f" |
|
|
|
# TODO: fix below; that method is not accurate |
|
|
|
# TODO: fix below; that method is not accurate |
|
|
|
# check-merge = "!f() { output=$(git format-patch ${1:-master} --stdout | git apply --3way --check - 2>/dev/null); exit_code=$?; if [ $exit_code != '0' ] && [ $exit_code != '128' ]; then echo 'Merge conflicts exist! See `git apply` output below:'; echo; echo $output; fi; }; f" |
|
|
|
# check-merge = "!f() { output=$(git format-patch ${1:-master} --stdout | git apply --3way --check - 2>/dev/null); exit_code=$?; if [ $exit_code != '0' ] && [ $exit_code != '128' ]; then echo 'Merge conflicts exist! See `git apply` output below:'; echo; echo $output; fi; }; f" |
|
|
|
co-pr = "!f() { \ |
|
|
|
co-pr = "!f() { \ |
|
|
@ -40,8 +40,6 @@ |
|
|
|
sur = submodule update --recursive |
|
|
|
sur = submodule update --recursive |
|
|
|
[apply] |
|
|
|
[apply] |
|
|
|
whitespace = fix |
|
|
|
whitespace = fix |
|
|
|
[branch] |
|
|
|
|
|
|
|
sort = -committerdate |
|
|
|
|
|
|
|
[color] |
|
|
|
[color] |
|
|
|
branch = auto |
|
|
|
branch = auto |
|
|
|
diff = auto |
|
|
|
diff = auto |
|
|
@ -94,8 +92,6 @@ |
|
|
|
fetch = +refs/notes/*:refs/notes/* |
|
|
|
fetch = +refs/notes/*:refs/notes/* |
|
|
|
[remote.upstream] |
|
|
|
[remote.upstream] |
|
|
|
fetch = +refs/notes/*:refs/notes/* |
|
|
|
fetch = +refs/notes/*:refs/notes/* |
|
|
|
[rerere] |
|
|
|
|
|
|
|
enabled = true |
|
|
|
|
|
|
|
[status] |
|
|
|
[status] |
|
|
|
submodulesummary = true |
|
|
|
submodulesummary = true |
|
|
|
[submodule] |
|
|
|
[submodule] |
|
|
|