Add cmp git alias to automatically checkout and pull the latest from main

This commit is contained in:
Dave Gallant
2022-02-10 10:13:00 -05:00
parent a2b87a10c1
commit eb56869f94
2 changed files with 16 additions and 15 deletions

30
flake.lock generated
View File

@@ -58,11 +58,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1643933104, "lastModified": 1644346464,
"narHash": "sha256-NZPuFxRsZKN8pjRuHPpzlMyt6JQhcjiduBG8bMghSjE=", "narHash": "sha256-hS8hwbr/PflMIfTWTmB7Xo5jIrsWhSAqtz5XXxPa0zQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "63dccc4e60422c1db2c3929b2fd1541f36b7e664", "rev": "e2aa1f598674aa9c06f28f5db60b89f37f1e961b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -81,11 +81,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1643987241, "lastModified": 1644475605,
"narHash": "sha256-s94M2ta+BkdVUrrSQQvwz7kenc+GPP7W1vvkwBLD0zk=", "narHash": "sha256-X5/QiC/nC8ul79z/0o9nIZYFqPzne1HbthGd5jJpsBA=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "dcbf9f93e9038d9b4eb782aff2a07e2560f6e04e", "rev": "3b4bf887104465fc7e821939ccbc44e9884a7d06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -102,11 +102,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1644048646, "lastModified": 1644480792,
"narHash": "sha256-wYTDoEI+ImMZN9oYvoNGQcFTxTDvrrLZKwohRIS+SN4=", "narHash": "sha256-opbdPSdAuRLFdwEbbzMuQO/U6bAua3jTxk+CIpN35uM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "002d0079996c03a318ee6ca389c4df87d3bbec31", "rev": "38d6ebe6b54e4778d71f6c64575aa986831c555b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -133,11 +133,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1643805626, "lastModified": 1644359234,
"narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", "narHash": "sha256-u/sBnRgrFrn9W8gZMS6vN3ZnJsoTvbws968TpqwlDJQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", "rev": "c5051e2b5fe9fab43a64f0e0d06b62c81a890b90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -149,11 +149,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1643805626, "lastModified": 1644420267,
"narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -47,6 +47,7 @@ in
cane = "commit -S --amend --no-edit"; cane = "commit -S --amend --no-edit";
cb = "checkout -b"; cb = "checkout -b";
co = "checkout"; co = "checkout";
cmp = "! git checkout main && git pl";
d = "diff"; d = "diff";
dc = "diff --cached"; dc = "diff --cached";
dcn = "diff --cached --name-only"; dcn = "diff --cached --name-only";