git pull ff = only; tag sort by date
dblume commited on 2024-02-06 14:31:21
Showing 1 changed files, with 4 additions and 2 deletions.
- .gitconfig 08e346d..d7eec70
| ... | ... |
@@ -20,11 +20,11 @@ |
| 20 | 20 |
whitespace = trailing-space,space-before-tab,tab-in-indent |
| 21 | 21 |
[alias] |
| 22 | 22 |
log1 = log --graph --abbrev-commit --decorate --date=short --format=format:'%C(bold blue)%h%C(reset) %C(bold green)%ad%C(reset) %C(white)%s%C(reset) %C(dim white)%an%C(reset)%C(bold yellow)%d%C(reset)' |
| 23 |
- logall = log --graph --abbrev-commit --decorate --date=short --format=format:'%C(bold blue)%h%C(reset) %C(bold green)%ad%C(reset) %C(white)%s%C(reset) %C(dim white)%an%C(reset)%C(bold yellow)%d%C(reset)' --all |
|
| 24 | 23 |
log2 = log --graph --abbrev-commit --decorate --date short --format=format:'%C(bold blue)%h%C(reset) %C(bold cyan)%ad%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)%an%C(reset)' --all |
| 25 | 24 |
logtree = log --graph --simplify-by-decoration --pretty=format:'%d' --all |
| 26 | 25 |
[pull] |
| 27 |
- rebase = false |
|
| 26 |
+ # https://jvns.ca/blog/2024/02/01/dealing-with-diverged-git-branches/#there-s-no-one-solution |
|
| 27 |
+ ff = only |
|
| 28 | 28 |
[init] |
| 29 | 29 |
defaultBranch = main |
| 30 | 30 |
[fetch] |
| ... | ... |
@@ -32,5 +32,7 @@ |
| 32 | 32 |
[merge] |
| 33 | 33 |
tool = vimdiff |
| 34 | 34 |
conflictstyle = diff3 |
| 35 |
+[tag] |
|
| 36 |
+ sort = -creatordate |
|
| 35 | 37 |
[include] |
| 36 | 38 |
path = ~/.gitconfig.local |
| 37 | 39 |