diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-12-21 10:41:25 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-12-23 22:52:38 -0700 |
| commit | 0ca0fa66c4c301adb0e67628619065b1cb07b161 (patch) | |
| tree | cf57d19fb91f72b3ac11fa0459017610f347693c /lib-src | |
| parent | 32d358e4c16551797711d2d1257f01249f670c06 (diff) | |
| download | dotfiles-0ca0fa66c4c301adb0e67628619065b1cb07b161.tar.gz | |
use merges to update master branch of src/athpriv
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/git/src/athpriv | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib-src/git/src/athpriv b/lib-src/git/src/athpriv index c766a192..6d7ac740 100644 --- a/lib-src/git/src/athpriv +++ b/lib-src/git/src/athpriv @@ -5,6 +5,9 @@ largefiles = include=*.SCORE or include=*.ADAPT synconlyannex = true +[branch "master"] + rebase = false + [mrrepo] review-unused = false |