]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/get-worktrees-unsort'
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Jul 2020 05:09:15 +0000 (22:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Jul 2020 05:09:15 +0000 (22:09 -0700)
API cleanup for get_worktrees()

* es/get-worktrees-unsort:
  worktree: drop get_worktrees() unused 'flags' argument
  worktree: drop get_worktrees() special-purpose sorting option

1  2 
branch.c
builtin/branch.c
builtin/fsck.c
builtin/reflog.c
builtin/worktree.c
ref-filter.c
revision.c
worktree.c

diff --cc branch.c
Simple merge
Simple merge
diff --cc builtin/fsck.c
Simple merge
Simple merge
Simple merge
diff --cc ref-filter.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc worktree.c
Simple merge