diff options
| author | Alan Pearce | 2019-03-06 15:47:42 +0000 |
|---|---|---|
| committer | Alan Pearce | 2019-03-06 15:47:42 +0000 |
| commit | 449b3d3254ef5c2fc17af1c5bc2dcf0644467d19 (patch) | |
| tree | 45fbd99be1101945ff8b54eac94f7f0c1665653a | |
| parent | e4fcc9c855fa89fda8d077c3bb353c719a4767eb (diff) | |
| download | dotfiles-449b3d3254ef5c2fc17af1c5bc2dcf0644467d19.tar.lz dotfiles-449b3d3254ef5c2fc17af1c5bc2dcf0644467d19.tar.zst dotfiles-449b3d3254ef5c2fc17af1c5bc2dcf0644467d19.zip | |
git: rebase by default, except on master
| -rw-r--r-- | git/.config/git/config | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index 8671d6a..859b275 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -7,6 +7,8 @@ diff = auto status = auto ui = true +[pull] + rebase = true [push] default = current followTags = true @@ -16,7 +18,6 @@ ci = commit br = branch co = checkout - ready = rebase -i @{u} lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\?[0-9]\" | tail -n1'" pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'" lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset' @@ -52,4 +53,8 @@ [merge "npm-merge-driver"] name = automatically merge npm lockfiles - driver = npx npm-merge-driver merge %A %O %B %P \ No newline at end of file + driver = npx npm-merge-driver merge %A %O %B %P +[remote] + autoSetupMerge = always +[branch "master"] + rebase = false |