lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-04-22 22:22:18 +02:00
Code Activity
tldr/pages/linux/pacdiff.md
Vitor Henrique d0a73c4b9c
pages*: fix brand and technical names (#12145) 
* pages*: fix Python, Java, pacman, apt, *zip*, xz, tar, git, RPM and grep names

* pages*: fix brand and technical names

Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com>

* fluxctl, gitmoji, in-toto-run, osv-scanner: replace `git` with Git

* bzegrep: enclose egrep with backticks

Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>

* git-bug: use Git instead of `git`

Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>

* git-bug: use Git instead of `git`

Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>

* git-force-clone: use Git instead of `git`

Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>

* gitwatch: use Git instead of `git`

Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>

* hub-init: use Git instead of `git`

Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>

* pages.*: use Linux instead of GNU/Linux

---------

Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com>
Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
2024-01-30 12:46:32 +08:00

677 B
Raw Blame History

pacdiff

Maintenance utility for .pacorig, .pacnew and .pacsave files created by pacman. More information: https://man.archlinux.org/man/pacdiff.

  • Review files that need maintenance in interactive mode:

pacdiff

  • Use sudo and sudoedit to remove and merge files:

pacdiff --sudo

  • Review files needing maintenance, creating .bakups of the original if you (O)verwrite:

pacdiff --sudo --backup

  • Use a specific editor to view and merge configuration files (default is vim -d):

DIFFPROG={{editor}} pacdiff

  • Scan for configuration files with locate instead of using pacman database:

pacdiff --locate

  • Display help:

pacdiff --help