This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from 19ab4fa pacdiff: Add option to use sudo/sudoedit to manage files new 35b5992 pacdiff: Fix regression in check for merge status new fea806c .mailmap: Map Daniel Parks new f6bf7f7 .mailmap: Map Denton Liu new 62190b1 pacdiff: update --sudo usages The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 62190b1 (HEAD -> master) pacdiff: update --sudo usages * f6bf7f7 .mailmap: Map Denton Liu * fea806c .mailmap: Map Daniel Parks * 35b5992 pacdiff: Fix regression in check for merge status Detailed log of new commits: commit 62190b1bf6c27ab9401c02d27962bf2b422d8ce3 Author: Denton Liu <liu.denton@gmail.com> Date: Mon Mar 29 02:02:42 2021 -0700 pacdiff: update --sudo usages In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files, 2021-03-27), the --sudo option was introduced. However, a corresponding entry was not included in the man page. Document it. Also, align the usage text in the program with its friends above. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Daniel M. Capella <polyzen@archlinux.org> commit f6bf7f77c5c812202ae7ade24c7bf8a0c3f12839 Author: Denton Liu <liu.denton@gmail.com> Date: Mon Mar 29 02:02:41 2021 -0700 .mailmap: Map Denton Liu In 94b2a19 (pacdiff: Learn the (M)erge mode, 2021-03-04), 348a296 (pacdiff: Reduce repetition in input loop, 2021-03-04), and b675c92 (pacdiff: Implement die(), 2021-03-04), the patches were erroneously applied with incorrect authorship information. Fix this with a new .mailmap entry. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Daniel M. Capella <polyzen@archlinux.org> commit fea806c6f048cb961b259cbca057bb964ed50d72 Author: Denton Liu <liu.denton@gmail.com> Date: Mon Mar 29 02:02:40 2021 -0700 .mailmap: Map Daniel Parks In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files, 2021-03-27), the patch was erroneously applied with incorrect authorship information. Fix this with a new .mailmap entry. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Daniel M. Capella <polyzen@archlinux.org> commit 35b59923ebcf7bd6b045ba1e00aab593e140f804 Author: Daniel M. Capella <polyzen@archlinux.org> Date: Sun Mar 28 03:39:02 2021 -0400 pacdiff: Fix regression in check for merge status Signed-off-by: Daniel M. Capella <polyzen@archlinux.org> Summary of changes: .mailmap | 2 ++ doc/pacdiff.8.txt | 3 +++ src/pacdiff.sh.in | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.