File gitconfig changed (mode: 100644) (index 16a6387..3051404) |
27 |
27 |
append = commit -v --amend -C HEAD |
append = commit -v --amend -C HEAD |
28 |
28 |
fix = !vim $(git-ls-files --unmerged | cut -f2 | uniq) |
fix = !vim $(git-ls-files --unmerged | cut -f2 | uniq) |
29 |
29 |
pend = log origin/master..HEAD |
pend = log origin/master..HEAD |
|
30 |
|
# to be used if upstream suddenly renamed master branch |
|
31 |
|
enslave = !run() { \n\ |
|
32 |
|
if [ -z "$1" ]";" then \n\ |
|
33 |
|
echo 'error: remote name must be provided as an argument' \n\ |
|
34 |
|
return 1 \n\ |
|
35 |
|
fi \n\ |
|
36 |
|
if [ "$#" -gt 1 ]";" then \n\ |
|
37 |
|
echo 'error: expected only one argument' \n\ |
|
38 |
|
return 1 \n\ |
|
39 |
|
fi \n\ |
|
40 |
|
git config --local --add "remote.$1.fetch" "+refs/heads/main:refs/remotes/$1/master" \n\ |
|
41 |
|
git config --local --add "remote.$1.push" refs/heads/master:refs/heads/main \n\ |
|
42 |
|
git config --local branch.master.merge refs/heads/main \n\ |
|
43 |
|
} && run |
30 |
44 |
|
|
31 |
45 |
[color] |
[color] |
32 |
46 |
# enable coloring of git output |
# enable coloring of git output |