Commit graph

18 commits

Author SHA1 Message Date
d3fbe7f4d6
git: Fix whitespace formatting 2020-07-23 12:25:46 +02:00
f542c418eb
[git] Add git last alias
Added git alias to show the contents of the last commit. Either use the
long form `git last`, or its alias `gll`.
2020-05-28 14:01:50 +02:00
d6a2ee7b8a
[git] Add diff-so-fancy as git diff
Added package diff-so-fancy and make diff use it by default for its
diffs by setting it as its diff-pager.

Added sanity function dsf which invokes diff-so-fancy if it exists or
degrades gracefully if it does not. Use this function for all git diff
needs.

Pre-fill the pager search term in git to enable jumping between changed
files with n/N.
2020-05-28 13:51:02 +02:00
17f8ca062d
[git] Clean up config formatting, color diffs
Made git aliasing exit if no git executable is found (which should not
happen, but still) instead of putting all aliases into the conditional.

Added unified colors to git diffs.

Cleaned up formatting of the files.
2020-05-28 13:35:15 +02:00
e9feecc440
[git] Fix git stash alias,set default pull options
Fixed git stash alias (gsta) not correctly detecting zsh shell for git
version guessing.

Set default options to automatically rebase on pull, automatically prune
on fetch, and automatically stash and squash on rebasing.

Also made git diff highlight moved code.
2020-05-25 17:36:27 +02:00
1ae92cfc2a
[bash] Fix bash profile initialization
Removed automatic initializations of zsh functions.
Fixed not calling correct folders for bash aliases, environment
variables and profile settings.
2020-05-19 17:34:28 +02:00
7648d9c8d3
[git] Change to only ssh pushing, verbose diffs
Changed url substitution to only work on pushing, so that we can always
make use of ssh keys but things like pulling through rust's cargo still
work.

Default to verbose diffs, even though we also set it in the alias.
2020-03-03 09:43:36 +01:00
92a01d99ee
[git] Substitute git for https connections
When git is invoked with https for either github or gitlab then
automatically switch it out to git@server.com
2020-02-20 22:47:00 +01:00
c76b0d0223
Sign commits by default
By default use the gpg signing key to sign any commit made from this
machine, or with the help of these dotfiles.
2020-02-07 22:36:00 +01:00
8741bbac24 Add git module README 2020-02-06 15:09:22 +01:00
d411be708e Add gitignore usage information, fix empty api calls
Added general usage information. Made sure gitignore api is never called
without any arguments.

Made script fzf aware -- if it finds fzf it can be invoked without
arguments, if it does not it will display usage information instead.
2020-02-06 15:07:55 +01:00
667595d2fb Fix static analysis 2020-02-04 15:27:44 +01:00
3668e11bbe Add git add interactive alias
Use gai to quickly reach interactive add mode.
2020-02-04 11:37:08 +01:00
2c374249d4 Move git aliases to git stow module 2020-02-04 10:06:33 +01:00
1684aaa50f Add gitignore function 2020-02-02 18:34:35 +01:00
87308cbce9 Add git merge merge request on sucess alias
Works for gitlab.com, will merge a MR when the pipeline has finished
running sucessfully.
2020-02-02 16:13:51 +01:00
6380affb6f Add basic XDG compliant sh architecture
The only file left in $HOME is .zshenv, which sets up zsh to source everything from XDG_CONFIG_HOME/zsh.
Shell files are split into sh and zsh directories, for global assignments (which should be posix compliant, work on any posix shell) like environemnt variables, xdg vars, and global aliases. zsh contains zsh specific customization (prompt customization, plugin loading, zsh completions).

Zsh initialization will pull from sh directory first, loading the respective mirror to its startup file (`.zprofile` loads `sh/profile` and `profile.d/*`, `.zshenv` loads `sh/env` and `sh/env.d/*` and `zsh/env.d/*`, `.zshrc` loads `sh/alias`, `sh/alias.d/*` and `zsh/alias.d/*`)

Once all is done, it will have loaded both global variables, aliases and settings, and zsh-only specifications. Other stow modules, if they want to add shell functionality, can include their aliases and functions in one of the above directories to automatically be picked up by zsh.
2020-02-02 15:08:40 +00:00
7ebcce8e82 Add global gitconfig, improve glog display
Added global git config file, following XDG specifications (putting it
under `XDG_CONFIG_HOME/git/config`).

Adding a small improvement to default dot session for tmux, so that its
log watcher now shows all refs and remote refs.
2020-02-01 11:15:22 +01:00