From 0e318f1357d21419f0df6e13f79b0823de781d38 Mon Sep 17 00:00:00 2001 From: Sebastian Kuzminsky Date: Thu, 10 Jul 2025 10:01:16 -0600 Subject: [PATCH] new description for issue 54f0eb67b05aa10763c86869ce840f33 --- 54f0eb67b05aa10763c86869ce840f33/description | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/54f0eb67b05aa10763c86869ce840f33/description b/54f0eb67b05aa10763c86869ce840f33/description index e54c1dc..bfb5ac4 100644 --- a/54f0eb67b05aa10763c86869ce840f33/description +++ b/54f0eb67b05aa10763c86869ce840f33/description @@ -1 +1,18 @@ -`ent sync` should report what changes got fetched & pushed +`ent sync` should report what changes got fetched & what changes will be pushed + +Currently `ent sync` does: + +1. `git fetch origin` +2. `git merge origin/entomologist-data` +3. `git push origin entomologist-data` + +I think after (1), before (2), we can do some easy, partially useful things: + +1. Show what we have locally that's not on the remote yet: + `git log -p entomologist-data ^origin/entomologist-data` + +2. Show what the remote has that we don't have locally: + `git log -p origin/entomologist-data ^entomologist-data ` + +Eventually (maybe after issue 5fe71e27727f4243dc997e63b9a02971) we can +display the changes in a simpler way.