Commit graph

18 commits

Author SHA1 Message Date
0acfe2d5d0
git: Add word-wise diff as quick alias
Since I often use git for prose and textual writing, wordwise
diffs make a lot of sense to have quick access to. This commit
sets up a git-internal alias `git diffword` as well as an
even shorter `gdd` (diff) and `gdds` (diff staged) which
mimic the other diff aliases `gd`/`gds` already existing.
2023-10-05 18:09:48 +02:00
0fcac78b1f
git: Add date-enabled short log aliases
In addition to the existing `glg` and `glga` aliases for showing
one-line git logs for current or all branches, this commit adds
`glgd` and `glgad` for showing one-line git logs for current or
all branches *with date information*.

The date info comes from authoring date not committing date.
2023-10-02 19:10:27 +02:00
892544df8e
git: Add fetchall alias
Added `git fetchall` (or `gfa`) alias which allows fetching the current
branch from all connected remotes simultaneously. May have some
unintended side effects when branches diverge, this is untested.
2022-11-04 15:14:54 +01:00
792e0b930a
git: Development checkout also switched to Staging
Using the `gcd` alias to checkout the development branch switches to, if
no `development` branch is found, the `staging` branch of a repository
automatically instead.
2022-01-28 10:14:20 +01:00
23be9c64c9
git: Change gco to git checkout
It happens too often that you want to `gco` a specific commit or tag for
switch to always be useful in every scenario with the shortcut.
2021-12-04 11:23:03 +01:00
df0cf3d540
git: Use switch instead of checkout if available
For git versions that support it, the aliases will use the newer
`switch` instruction instead of `checkout` for its use cases.
Creating a new branch through `gcb` is for example done by
`git switch -c` instead of the older `git checkout -b`.

Additionally streamlined git version checking to be a little faster and
to unify its approach on posix sh, bash and zsh instead of utilizing
individual checking functions.
2021-11-23 10:42:45 +01:00
bb9030f885
bash: Fix git stash alias setting
Fixed bash alias loading for additional modules by loading both general
sh aliases as well as individual bash aliases.

Moved git stash push/save aliasing to split between bash/zsh shell since
zsh can check for the correct version of git to invoke push command
(only part of git since 2.13) and bash simply falls back to save.
2021-07-07 10:24:04 +02:00
f4400da743
repo: Update linting for 4-spaced shell scripts 2021-04-04 20:52:52 +02:00
78e678fe1f
git: Add main branch methods, Fix pushall
Fixed 'pushall' option xargs error.

Added dealing with 'main' branch instead of 'master' branch in checkout
and rebase aliases, so that when invoking the commands it will default
to a master branch and fall back to a main branch before complaining
that no corresponding branch exists.

Should (silently) fix git repositories which switched to main in the
last few months, and simultaneously allows me to switch this repository
to main branch (already done.)
2021-03-14 13:02:47 +01:00
98cb2ba48c
git: Add basic git rebase quick-alias
Every so often, when doing rebases, you need quick access to the git
rebase command to do something like '--edit-todo' or similar.

Every time, I tried to do `grb` since I already use these quick
shortcuts for `grbm` rebasing onto master, and `grbi`, `grbc` to rebase
interactively or continue one in progress. The base version is thus a
natural extension of the more detailed implementations of rebasing.
2020-09-18 17:17:48 +02:00
df12199fdb
git: Add git pushall alias
`git pushall` (aliased to gpa) will push the current branch to each
connected remote of the repository.

So, if you have gitlab, github and keybase connected as remotes, it will
push to each one in return. As with the normal push command, you can
specify which branch to push ('master', 'develop', ..) after the
command, or use `--all` to push all branches at once.
2020-09-18 17:12:21 +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
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
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