summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Fabian Stelzer <fs@gigacodes.de>2021-11-19 16:07:07 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-19 09:05:27 -0800
commit3b4b5a793a36d1e92114ff929eb7d15d55d45a96 (patch)
treef445a75b17051e6b697c1bed0bb24dd74636af0a /Documentation/merge-options.txt
parentssh signing: support non ssh-* keytypes (diff)
downloadtgif-3b4b5a793a36d1e92114ff929eb7d15d55d45a96.tar.xz
ssh signing: make sign/amend test more resilient
The test `amending already signed commit` is using git checkout to select a specific commit to amend. In case an earlier test fails and leaves behind a dirty index/worktree this test would fail as well. Using `checkout -f` will avoid interference by most other tests. Signed-off-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions