diff --git a/.config/git/ignore b/.config/git/ignore index 82d5bc3..e164945 100644 --- a/.config/git/ignore +++ b/.config/git/ignore @@ -69,3 +69,8 @@ captures/ ### Android Patch ### gen-external-apklibs +# Kernel +*.o.cmd +*.ko.cmd +modules.builtin +modules.order diff --git a/.gitconfig b/.gitconfig index a1e3f9c..954c503 100644 --- a/.gitconfig +++ b/.gitconfig @@ -17,10 +17,12 @@ br = branch df = diff dc = diff --cached - lg = log -p +# lg = log -p lol = log --graph --decorate --pretty=oneline --abbrev-commit lola = log --graph --decorate --pretty=oneline --abbrev-commit --all lolp = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit + lg = log -p --pretty=fuller --abbrev-commit + lgg = log --pretty=fuller --abbrev-commit --stat ls = ls-files dt = difftool # to have diff with meld mylog = log --committer=\"$(git config user.name)\" @@ -63,6 +65,7 @@ cc = "!git code-changes" fixup = "commit --fixup" ri = "rebase -i --autosquash" + up = pull --rebase [branch] #New branch track remote #autosetupmerge = always