projects / tools.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9a56a66) | patch
Make ghmerge compatible with Git worktrees
authorHugo Landau <hlandau@openssl.org>
Tue, 7 Nov 2023 07:38:09 +0000 (07:38 +0000)
committerTomas Mraz <tomas@openssl.org>
Wed, 8 Nov 2023 11:02:32 +0000 (12:02 +0100)
commit2ddf1e0a008b34e84770fbccf5f174163eaeafef
tree06b2f9864a9d550f8704ca406dd418071c878423tree | snapshot
parent9a56a661d5025163d71f04f440df8fd6ff4f2d91commit | diff
Make ghmerge compatible with Git worktrees

Git worktrees have .git be a file containing a string identifying the
location of the real .git directory. Thus -d will not match these
worktrees. Use -e instead.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/171)
review-tools/ghmerge diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.