summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 15:50:14 +0100
committerLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 15:50:14 +0100
commitd7bdabe52fbbde2ec1cbabdc8bdc737a8ead26aa (patch)
tree892602aee0289e0496c2b1e343d24f70879df749 /t/t3507-cherry-pick-conflict.sh
parentGit 2.29.2 (diff)
parentGit 2.28.1 (diff)
downloadtgif-d7bdabe52fbbde2ec1cbabdc8bdc737a8ead26aa.tar.xz
Sync with 2.28.1
* maint-2.28: Git 2.28.1 Git 2.27.1 Git 2.26.3 Git 2.25.5 Git 2.24.4 Git 2.23.4 Git 2.22.5 Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions