changeset
Update for newer configs, use autostash
Fri, 05 Aug 2022 20:56:17 -0500
- author
- Meredith Howard <mhoward@roomag.org>
- date
- Fri, 05 Aug 2022 20:56:17 -0500
- changeset 997
- 9e1ec7624f59
- parent 996
- 5563c242fe04
- child 998
- 6e682b7355ba
Update for newer configs, use autostash
| .gitconfig | file | annotate | diff | comparison | revisions |
--- a/.gitconfig +++ b/.gitconfig @@ -23,7 +23,7 @@ rollback = reset --soft ^HEAD histedit = rebase -i --autosquash --onto @{u}... @{u} pushf = push --force-with-lease - up = pull -r --prune + up = pull update = "!git remote update -p && git merge --ff-only --stat @{u}" in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" out = "!git log --pretty=onelinecustom @{u}.." @@ -51,7 +51,6 @@ conflictstyle = diff3 [branch] - autosetuprebase = always autosetupmerge = always [commit] @@ -61,17 +60,22 @@ [diff] compactionheuristic = true +[pull] + rebase = true + [push] default = current -[rebase] - stat = true +[fetch] + prune = true -[rerere] - autoupdate = true +[rebase] + autostash = true + stat = true [transfer] fsckobjects = true + [fetch "fsck"] zeroPaddedFilemode = ignore badDate = ignore
