|
[user] |
|
name = ryohey |
|
email = [email protected] |
|
|
|
#driver for merging Xcode project files |
|
[mergetool "mergepbx"] |
|
cmd = mergepbx "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED" |
|
[filter "lfs"] |
|
clean = git-lfs clean -- %f |
|
smudge = git-lfs smudge -- %f |
|
process = git-lfs filter-process |
|
required = true |
|
|
|
[color] |
|
ui = true |
|
|
|
[color "branch"] |
|
current = yellow reverse |
|
local = yellow |
|
remote = green |
|
|
|
[color "diff"] |
|
meta = yellow bold |
|
frag = magenta bold |
|
old = red |
|
new = green |
|
|
|
[alias] |
|
# add |
|
a = add # add |
|
chunkyadd = add --patch # stage commits chunk by chunk |
|
|
|
#via http://stackoverflow.com/questions/5188320/how-can-i-get-a-list-of-git-branches-ordered-by-most-recent-commit |
|
recent-branches = !git for-each-ref --count=5 --sort=-committerdate refs/heads/ --format='%(refname:short)' |
|
|
|
# branch |
|
b = branch -v # branch (verbose) |
|
|
|
# commit |
|
c = commit -m # commit with message |
|
ca = commit -am # commit all with message |
|
ci = commit # commit |
|
amend = commit --amend # ammend your last commit |
|
|
|
# checkout |
|
co = checkout # checkout |
|
nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...") |
|
|
|
# cherry-pick |
|
cp = cherry-pick -x # grab a change from a branch |
|
|
|
# diff |
|
d = diff # diff unstaged changes |
|
dc = diff --cached # diff staged changes |
|
last = diff HEAD^ # diff last committed change |
|
|
|
# log |
|
l = log --graph --date=short |
|
changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status |
|
short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" |
|
simple = log --pretty=format:\" * %s\" |
|
shortnocolor = log --pretty=format:\"%h %cr %cn %s\" |
|
|
|
# pull |
|
pl = pull # pull |
|
|
|
# push |
|
ps = push # push |
|
|
|
# rebase |
|
rc = rebase --continue # continue rebase |
|
rs = rebase --skip # skip rebase |
|
|
|
# remote |
|
r = remote -v # show remotes (verbose) |
|
|
|
# reset |
|
unstage = reset HEAD # remove files from index (tracking) |
|
uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state |
|
filelog = log -u # show changes to a file |
|
mt = mergetool # fire up the merge tool |
|
|
|
# stash |
|
ss = stash # stash changes |
|
sl = stash list # list stashes |
|
sa = stash apply # apply stash (restore changes) |
|
sd = stash drop # drop stashes (destory changes) |
|
|
|
# status |
|
s = status # status |
|
st = status # status |
|
stat = status # status |
|
|
|
delete-merged = !git branch --merged | egrep -v '\\*|master|development' | xargs git branch -d |
|
|
|
[core] |
|
ignorecase = false |
|
[credential] |
|
helper = cache |
|
[pull] |
|
ff = only |
|
[init] |
|
defaultBranch = main |
Xcode の run script から見えるようにする
yonaskolb/Mint#188 (comment)
下記は Xcode から環境変数が読み込まれなかったので必要なし