diff --git a/CHANGELOG.md b/CHANGELOG.md index 63fc72a..4c10522 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.3.0] - 2021-11-08 +### Added +- [Git Config](home/.config/git/config) + ## [1.2.6] - 2021-11-08 ### Changed - Short to long options in [Bash Config](home/.bashrc) diff --git a/README.md b/README.md index dbdd9e3..a4114c6 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Repository with my dotfiles. * [Bash](http://www.gnu.org/software/bash/) - [ .bashrc](home/.bashrc) +* [Git](https://git-scm.com/) - [config](home/.config/git/config) * [Termux](https://termux.com/) - [termux.properties](home/.termux/termux.properties) * [Vim](https://www.vim.org/) - [.vimrc](home/.vimrc) diff --git a/VERSION b/VERSION index 3c43790..f0bb29e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.6 +1.3.0 diff --git a/home/.config/git/config b/home/.config/git/config new file mode 100644 index 0000000..0b537f7 --- /dev/null +++ b/home/.config/git/config @@ -0,0 +1,59 @@ +[alias] + a = add + ba = branch + bach = "!f() { \ + git ba \"$1\" && \ + git ch \"$1\"; \ + }; f" + bd = ba -d + bfd = ba -D + ch = checkout + cl = clone + cl1 = cl --depth=1 + co = commit -sm + coa = "!f() { \ + local message=\"$1\"; \ + local author=\"$2\"; \ + git co \"${message}\" --author \"${author}\"; \ + }; f" + cota = "!f() { \ + local version=\"v$(cat VERSION)\"; \ + git co \"$1\" && \ + git ta \"${version}\"; \ + }; f" + fu = "!f() { \ + git fetch upstream && \ + git ch master && \ + git rebase upstream/master; \ + }; f" + fup = fu && p + p = push + pa = push --all + pt = push --tags + pat = pa && pt + r = remote + ra = r add + rau = r set-url --add + rl = r -v + rr = r remove + s = status + t = tag + ta = "!f() { \ + git t -am \"$1\" \"$1\"; \ + }; f" + td = t -d + tl = t -l +[commit] + gpgSign = true +[core] + editor = vim + pager = less +[include] + path = ~/.config/git/config-secret +[init] + defaultBranch = main +[http] + proxy = socks5h://127.0.0.1:9050 +[tag] + forceSignAnnotated = true + gpgSign = true