From 1ddd45e3626644d8411d7fd8699bb6e1335ebe58 Mon Sep 17 00:00:00 2001 From: Jacob Stopak <49353917+initialcommit-io@users.noreply.github.com> Date: Sat, 22 Apr 2023 20:33:47 -0700 Subject: [PATCH 1/5] Fix readme typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 60691c2..5eb5a3b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Example: `$ git-sim merge ` - Run a one-liner git-sim command in the terminal to generate a custom Git command visualization (.jpg) from your repo - Supported commands: `log`, `status`, `add`, `restore`, `commit`, `stash`, `branch`, `tag`, `reset`, `revert`, `merge`, `rebase`, `cherry-pick`, `switch`, `checkout`, `fetch`, `pull`, `push`, `clone`, `rm`, `mv`, `clean` - Generate an animated video (.mp4) instead of a static image using the `--animate` flag (note: significant performance slowdown, it is recommended to use `--low-quality` to speed up testing and remove when ready to generate presentation-quality video) -- Color commits by parameter, such as author the `--color-by=author` option +- Color commits by parameter, such as author with the `--color-by=author` option - Choose between dark mode (default) and light mode - Specify output formats of either jpg, png, mp4, or webm - Combine with bundled command [git-dummy](https://github.com/initialcommit-com/git-dummy) to generate a dummy Git repo and then simulate operations on it From 7a76449be5701448507c22c2ce28d9448967c02d Mon Sep 17 00:00:00 2001 From: Jacob Stopak <49353917+initialcommit-io@users.noreply.github.com> Date: Sat, 22 Apr 2023 21:08:25 -0700 Subject: [PATCH 2/5] Update header example image in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5eb5a3b..6f52618 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Command syntax is based directly on Git's command-line syntax, so using git-sim Example: `$ git-sim merge ` -![git-sim-merge_01-05-23_09-44-46](https://user-images.githubusercontent.com/49353917/210939840-1d51493a-6cac-43fd-9d12-3d2948d32c61.jpg) +![git-sim-merge_04-22-23_21-04-32](https://user-images.githubusercontent.com/49353917/233819299-79ed57a5-ef46-49e5-9441-901185457877.jpg) ## Use cases - Visualize Git commands to understand their effects on your repo before actually running them From 6292f8c85993eb2a706abf483aec70cae001f758 Mon Sep 17 00:00:00 2001 From: Jacob Stopak <49353917+initialcommit-io@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:44:00 -0700 Subject: [PATCH 3/5] Crop example image in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6f52618..f36fae1 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ This generates an image (default) or video visualization depicting the Git comma Command syntax is based directly on Git's command-line syntax, so using git-sim is as familiar as possible. Example: `$ git-sim merge ` - -![git-sim-merge_04-22-23_21-04-32](https://user-images.githubusercontent.com/49353917/233819299-79ed57a5-ef46-49e5-9441-901185457877.jpg) +

+![git-sim-merge_04-22-23_21-04-32_cropped](https://user-images.githubusercontent.com/49353917/233821875-a7bb640d-10be-4433-a8fb-bd25646eeff4.jpg) ## Use cases - Visualize Git commands to understand their effects on your repo before actually running them From 6639de23efa16b2a3858e4872c66f0fe62ef0b1e Mon Sep 17 00:00:00 2001 From: Jacob Stopak Date: Sun, 11 Jun 2023 19:52:59 -0700 Subject: [PATCH 4/5] Fix bug in merge subcommand due to removed method is_remote_tracking_branch() Signed-off-by: Jacob Stopak --- git_sim/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_sim/merge.py b/git_sim/merge.py index d00a90d..7142e72 100644 --- a/git_sim/merge.py +++ b/git_sim/merge.py @@ -60,7 +60,7 @@ def construct(self): head_commit = self.get_commit() branch_commit = self.get_commit(self.branch) - if not self.is_remote_tracking_branch(self.branch): + if self.branch not in self.get_remote_tracking_branches(): if self.branch in self.repo.git.branch("--contains", head_commit.hexsha): self.ff = True else: From e2e01590634903572a44d720bfb4f8b1037694ac Mon Sep 17 00:00:00 2001 From: Jacob Stopak Date: Sun, 11 Jun 2023 19:55:30 -0700 Subject: [PATCH 5/5] Bump version to 0.3.2 Signed-off-by: Jacob Stopak --- git_sim/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_sim/__init__.py b/git_sim/__init__.py index 260c070..f9aa3e1 100644 --- a/git_sim/__init__.py +++ b/git_sim/__init__.py @@ -1 +1 @@ -__version__ = "0.3.1" +__version__ = "0.3.2"