diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-02-15 17:24:57 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-02-15 17:24:57 +0900 |
| commit | 0c91574dff7d8e3aa2e836423f085c2166aabac9 (patch) | |
| tree | 38f83b70015e78197a77b5bd2e89329211121334 | |
| parent | f55d9fd1e56ce74c91d43194d2516125266ddbcf (diff) | |
| download | dotfiles-0c91574dff7d8e3aa2e836423f085c2166aabac9.tar.gz dotfiles-0c91574dff7d8e3aa2e836423f085c2166aabac9.tar.zst dotfiles-0c91574dff7d8e3aa2e836423f085c2166aabac9.zip | |
git: fix last-merge-commit
With this change, "git last-merge-commit" works correctly even if the
current working tree has a file or directory named "HEAD".
| -rw-r--r-- | .config/git/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.config/git/config b/.config/git/config index 4763b50..bc29078 100644 --- a/.config/git/config +++ b/.config/git/config @@ -176,7 +176,7 @@ cpick = cherry-pick cpickc = "!GIT_EDITOR=true git cherry-pick --continue" empty = commit --allow-empty - last-merge-commit = "!git rev-list --abbrev-commit --merges HEAD | head -n 1" + last-merge-commit = "!git rev-list --abbrev-commit --merges HEAD -- | head -n 1" config-user = "!__fn() { \ if [ \"$1\" = nsfisis ]; then \ git config user.name nsfisis && git config user.email nsfisis@gmail.com; \ |