diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:48 -0800 |
| commit | 2cf8c9053afbb666dc30f384d313e3e85e00d53a (patch) | |
| tree | fd01ddd420738378def4893a367ea88441aa348c /t/t7610-mergetool.sh | |
| parent | Merge branch 'nd/qsort-in-merge-recursive' (diff) | |
| parent | worktree list: keep the list sorted (diff) | |
| download | tgif-2cf8c9053afbb666dc30f384d313e3e85e00d53a.tar.xz | |
Merge branch 'nd/worktree-list-fixup'
The output from "git worktree list" was made in readdir() order,
and was unstable.
* nd/worktree-list-fixup:
worktree list: keep the list sorted
worktree.c: get_worktrees() takes a new flag argument
get_worktrees() must return main worktree as first item even on error
worktree: reorder an if statement
worktree.c: zero new 'struct worktree' on allocation
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions