ef3e3387b7
git: Remove core.excludesfile option
...
Remove the `core.excludesfile` option as it only sets the default value
`${XDG_CONFIG_HOME:-$HOME/.config}/git/ignore` but while hardcoding the
default value `~/.config` for `XDG_CONFIG_HOME`.
2022-06-23 23:58:53 +02:00
476081e2a2
git: Set log.follow
...
I always want to 'follow' if possible.
2022-06-23 23:58:37 +02:00
1149424d0d
git:alias: Add autofixup and autosquash
...
Automatically fixup/squash marked commits without opening the
git-rebase-todo.
2022-06-23 23:58:36 +02:00
f76d16f01b
git: Move user.config include block to EOF
2022-06-23 23:58:35 +02:00
c2390f5fcd
vim:fugitive: Fix committing with locked gpg-key
2022-06-23 23:58:34 +02:00
e594799835
git:ignore: Add Obsession.vim session files
2022-06-23 23:56:53 +02:00
f44125937f
git:alias: Add checkout-worktree
...
Reuse the autoloadable function as git alias. This way
`git-checkout-worktree` as well as `git checkout-worktree` are possible.
2022-03-31 15:21:22 +02:00
869a1bce6e
git: Readd function in spull alias
...
This reverts commit 54d716510b
2022-03-31 14:20:09 +02:00
70b9a74029
git: Add signoff alias to git-signoff
2022-03-30 03:01:19 +02:00
2495dc7b2d
git: Remove nvimdiff as merge.tool
2022-03-30 03:00:46 +02:00
71f41ab994
git: Set blame.date to short
2022-03-20 17:30:48 +01:00
17433d0528
git:core.pager: Remove the search pattern
...
This gets really annoying as it complains in many cases that it cannot
find a match for the pattern when the pager is used for other things
than commits.
2022-02-03 18:59:00 +01:00
54d716510b
git: Drop function in spull
...
The function is not needed as git can just execute chains of commands.
2022-02-03 18:56:38 +01:00
7252bee741
git: Add filter-repo as alias
2022-02-03 18:47:24 +01:00
8c1f4b20f5
git: Add git-filter-repo as submodule
2022-02-03 18:34:33 +01:00
00355ec6f7
git: Enable rerere
...
Activate recording of resolved conflicts, so that identical conflict
hunks can be resolved automatically, should they be encountered again.
2022-02-03 18:31:20 +01:00
48090260aa
git: Set branch.autosetuprebase to always
2022-02-01 01:10:56 +01:00
8da651fd27
LICENSE,git: Use real name instead of pseudonym
...
Also specify email address in the LICENSE.
2022-01-31 13:04:43 +01:00
7f52c7a4cb
git,zsh:autoload: Move git-track into own function
...
Move `git-track` into its own autoloadable function.
This way it is
better maintainable as in one-liner format and brings the possibility of
having more complexity (e.g. for better portability).
By that it is also now executable as `git-track` as well as `git track`
as before.
2022-01-31 12:50:54 +01:00
cb7263e77d
*: Update plugins and other submodules
2022-01-29 22:42:33 +01:00
ef7196f2ca
git: Add fixes alias and pretty format
...
This allows printing for 'Fixes:' tags as mentioned in the kernel
documentation:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html
2022-01-12 12:41:22 +01:00
157c2ae43f
git: Abrreviate commit SHA-1 IDs with 12 chars
2022-01-12 12:36:07 +01:00
3c40002a4a
git: Sort config lines and fix indentation
2022-01-02 23:28:34 +01:00
eb74eb274c
git:alias:track: Add horizontal line under header
2021-11-18 17:13:50 +01:00
9f65a22df7
git:alias:track: Merge both sed invocations
2021-11-18 04:21:39 +01:00
225a17c437
git:alias:track: Get rid of function definition
...
The function definition in the spull alias is only needed for the
processing of arguments. In `track`s case it is completely unnecessary.
2021-11-18 04:06:54 +01:00
74a329a7ea
git:alias: Add branches as alias for track
2021-11-18 03:39:40 +01:00
081e78562f
git:alias:track: Fix strange split header line bug
...
Fix weird issue that when `column` is used to display the header line,
it is split over two lines sometimes.
```
local
remote
origin/HEAD
dev origin/dev
main origin/main
origin/utils
```
2021-11-18 00:57:45 +01:00
227495e7c7
git:alias:track: Separate remotes with newlines
2021-11-18 00:53:56 +01:00
7b5dbd7851
git:alias:track: Name the table columns
...
Also use `column` to reorder the columns instead of `sed`.
2021-11-17 01:36:21 +01:00
11dab14da3
git:alias:track: Shorten command
...
Shorten command by always printing a `,` as separator and
differentiating between remote and head refs by a leading slash.
2021-11-17 01:23:33 +01:00
f11be2c1a9
git:alias:track: Fix multiple branch filtering
...
This fixes the deletion/filtering of branches if there were multiple
local branches tracking the same remote branch.
2021-11-15 18:51:55 +01:00
3297ba81b4
git:alias:track: Also list non-tracked remotes
...
The alias now lists all local *and* all remote branches and displays how
they are linked.
The `sort -uk1,1` deletes all duplicate entries of remote branches as
they could be listed as %(upstream) as well as %(refname) through the
`refs/remotes/`.
TODO:
This deletes too many entries when multiple local branches track
the same remote branch. (Why ever you should do that...)
I guess this could be resolved by using `awk` for the uniqueness.
2021-11-12 15:56:01 +01:00
1fd2c730d9
git:alias:track: Do not print trailing arrow
...
Do not print trailing arrow when the local branch is not tracking a
remote branch.
2021-11-12 14:32:01 +01:00
2434f3fc4c
git: Add track alias
...
This command lists all branches and what remote branch they are
tracking.
2021-11-12 14:30:40 +01:00
ade4486b84
git: Disable addIgnoredFile advice
2021-10-06 21:41:28 +02:00
2e4955645a
git: Never add 'into <branch>' to merge message
2021-09-16 04:33:19 +02:00
c23613e2d5
git: Disable advice about detached head
2021-07-23 12:05:56 +02:00
ec94e7ebdd
git: Set push.default to current
...
Push current branch to branch of same name.
This is useful for new branches as I almost always push those with:
```
git push -u origin "$(git branch --show-current)"
```
2021-07-07 12:02:27 +02:00
06d37a273c
git:pull: Use fast-forward only
...
If I cannot fast-forward I want to stop and think about how I want to
continue (merge or rebase).
2021-05-16 00:51:29 +02:00
3029e30589
git:ignore: Add compile_flags.txt
2021-05-04 10:50:45 +02:00
a9b5c19f2f
git: Use 'main' as default branch name
2021-04-20 11:51:31 +02:00
a72eca0bf7
git:ignore: Add tags.{lock,temp}
2021-04-12 21:01:22 +02:00
2478e7200e
git: Globally ignore node_modules
2021-04-04 10:50:48 +02:00
2a9b9530e9
git:alias: Fix spull to actually execute
2021-03-11 01:37:32 +01:00
2564c7540f
git 📟 Add tags and stashes to search pattern
...
For example when viewing tags (to start from the start of the file) or
listing stashes with `git stash list -u`.
2021-02-18 02:13:40 +01:00
c74cfa3901
vim,git: Integrate ctags
2020-12-21 13:55:49 +01:00
25d0729668
git: Use nvimdiff as merge- and difftool
2020-12-18 23:33:01 +01:00
f9e37dbc18
git: Set pull.rebase and merge.log
...
Rebase branches on top of the fetched branch, instead of merging.
Include summaries of merged commits in new merge commit messages.
2020-11-29 13:49:46 +01:00
d671376705
git: Change signingkey
...
I changed my email in a6dabac
2020-11-29 13:30:34 +01:00
