diff options
| author | nsfisis <nsfisis@gmail.com> | 2022-12-14 20:18:25 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2022-12-15 22:07:17 +0900 |
| commit | 8e63a43c303a029a706a8e076d1541e9f2f038f4 (patch) | |
| tree | b02383009d1ea81d07ddda6f0f89b92c2d4dcae3 | |
| parent | 1e550c34671d0b3b4d5843bfc7999e6f3f2a3979 (diff) | |
| download | dotfiles-8e63a43c303a029a706a8e076d1541e9f2f038f4.tar.gz dotfiles-8e63a43c303a029a706a8e076d1541e9f2f038f4.tar.zst dotfiles-8e63a43c303a029a706a8e076d1541e9f2f038f4.zip | |
git: make aliases more portable
| -rw-r--r-- | .config/git/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.config/git/config b/.config/git/config index 6ccf81f..d1dce9a 100644 --- a/.config/git/config +++ b/.config/git/config @@ -104,7 +104,7 @@ last = log --pretty=fuller -1 l = "!__fn() { \ local last_merge_commit=\"$(git last-merge-commit)\"; \ - if [[ -n \"$last_merge_commit\" ]]; then \ + if [ -n \"$last_merge_commit\" ]; then \ git log --oneline --boundary \"$last_merge_commit\".. \"$@\"; \ else \ git log --oneline -n 10 \"$@\"; \ @@ -120,7 +120,7 @@ re = restore rep = restore -p m = "!__fn() { \ - if [[ \"$1\" == --abort ]]; then \ + if [ \"$1\" = --abort ]; then \ git merge --abort; \ else \ git merge --no-edit \"$@\"; \ |