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
a6dabac96d
git: Use real email
2020-11-27 04:55:33 +01:00
druckdev
6cac0dc53a
git: Show patch of the changes in commit message
...
The changes are only shown in the editor and do not land in the final
commit message.
For that setting the git-commit-last-msg function and the commit-msg
hook had to be updated.
The function is now a standalone function instead of anonymous and
uses every line until the first comment in COMMIT_EDITMSG discarding the
new information too.
The hook breaks now when checking line lengths when the changes start
since for some weird reason they are passed together with the rest of
the message instead of being deleted like the comments.
2020-11-23 01:27:51 +01:00
druckdev
eb177d457e
git: Add submodules to the pager changes regex
2020-11-07 03:21:35 +01:00
druckdev
0fe0679276
all: Update submodules
2020-11-03 00:21:46 +01:00
druckdev
23f7cb3fde
git: Add user details
2020-11-03 00:04:52 +01:00
druckdev
e846de0570
git: Use github per default
...
user.config holds some path were I want to use my gitlab account.
2020-10-31 22:38:46 +01:00
druckdev
093c3a6f9c
git: Highlight current match in pager
2020-09-28 04:12:40 +02:00
druckdev
03e31ee636
git: Add renamings of files as jump-point
2020-09-25 00:52:13 +02:00
druckdev
436c17c2f5
git: Jump to commit instead of Date
...
When jumping to commits using "Date", the commit and (more importantly)
the author were not shown.
2020-09-25 00:39:39 +02:00
druckdev
7e0e0f5baf
git: Enable jumps between different files in diff
...
Jump between file sections and commits by using n and N. Taken from:
https://github.com/so-fancy/diff-so-fancy/blob/eef379ee43f86/pro-tips.md
Remove FX flags since they are incompatible with the pattern search:
When showing a small change that fits on less than the screen height,
the rest of the screen is filled with ~ lines instead of quitting the
pager. This behaviour is annoying and thus the flags are deactivated.
Since git adds them per default they have to be explicitly disabled.
2020-09-24 03:24:56 +02:00
druckdev
f6d1bbb19d
git: Add diff-so-fancy as submodule
...
Instead of relying on diff-so-fancy being installed already deliver it
with these dotfiles.
2020-09-24 02:55:49 +02:00
druckdev
8db0d4c368
git: Autostash when rebasing
...
(When necessary) Automatically stash changes before rebasing and pop
them back from stack when done.
2020-09-23 03:07:07 +02:00
druckdev
f8c8a290e5
Add git configurations for submodules
...
Add git configurations for better work with submodules taken from
https://medium.com/@porteneuve/mastering-git-submodules-34c65e940407 .
Add alias that syncs submodules when pulling.
Include information of changes in submodules in diff and status.
2020-09-15 10:42:27 +02:00
druckdev
dba6ad3c1b
Ignore vscode files
2020-09-10 06:30:34 +02:00
druckdev
c7c51a33fb
Add git alias for root of repo
2020-08-25 14:52:57 +02:00
druckdev
31da6669e9
Globally ignore all compiled zsh-files
2020-08-04 06:19:18 +02:00
druckdev
5e5ec4098a
Do not always pull submodules
...
Stop always recursively pulling submodules too, since it annoys me and
if it is important for a project, it will probably stand in the README.
2020-08-04 06:02:30 +02:00
druckdev
2c2baa7187
User management and tabs
...
Use Github credentials when in Projects/github folder.
All other custom github projects are stored in user.config.
Use 8 spaces for tabs to see whitespace error in git diffs.
2020-06-24 15:39:04 +02:00
druckdev
0c743950ac
Initial commit
2020-04-23 14:50:36 +02:00
