diff options
| author | Johannes Löthberg <johannes@kyriasis.com> | 2016-12-20 19:15:45 +0100 |
|---|---|---|
| committer | Johannes Löthberg <johannes@kyriasis.com> | 2017-06-01 18:37:35 +0200 |
| commit | 145a8cbc344d66b0e0ba582d02745ea2f5bf3564 (patch) | |
| tree | e3d2e6dc0fd7f6113309c71ca4e21941efdb3d88 | |
| parent | bf99b49e430f6976498aeb57a9bb068a40288457 (diff) | |
| download | dotfiles-145a8cbc344d66b0e0ba582d02745ea2f5bf3564.tar.xz | |
git: Make push.default simple
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
| -rw-r--r-- | git/config | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -94,7 +94,7 @@ conflictStyle = diff3 [push] - default = current + default = simple [repack] writebitmaps = true |