[Bin] add script to open ediff as a diff tool
This commit is contained in:
parent
3073990aa2
commit
440ebe4a5d
1
.profile
1
.profile
@ -52,6 +52,7 @@ export CHROME_EXECUTABLE=/usr/bin/chromium
|
||||
export DENO_DIR="$HOME/.config/deno"
|
||||
export DENO_INSTALL_ROOT="$HOME/.local/bin/deno"
|
||||
|
||||
export DIFFPROG=ediff
|
||||
export SUDO_ASKPASS="$HOME/.local/bin/askpass"
|
||||
export MANPAGER="sh -c 'col -bx | bat -l man -p'"
|
||||
|
||||
|
@ -616,10 +616,22 @@ xinput map-to-output "$ID" "$SCREEN"
|
||||
:CUSTOM_ID: Emacs-stuff-Dired-2eeca9da
|
||||
:HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/dired
|
||||
:END:
|
||||
This script allows me to open anything in dired from the command line.
|
||||
#+BEGIN_SRC bash
|
||||
emacsclient -c -a emacs -e "(dired \"$*\")"
|
||||
#+END_SRC
|
||||
|
||||
** Ediff
|
||||
:PROPERTIES:
|
||||
:CUSTOM_ID: EmacsstuffEdiff-a6adcl503uj0
|
||||
:HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/ediff
|
||||
:END:
|
||||
I want Ediff as my merge tool, not just with Git but with other
|
||||
programs too such as =pacdiff=.
|
||||
#+begin_src bash
|
||||
emacsclient -c -a emacs -e "(ediff-files \"$1\" \"$2\")"
|
||||
#+end_src
|
||||
|
||||
** Emacsmail
|
||||
:PROPERTIES:
|
||||
:HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/emacsmail
|
||||
|
Loading…
Reference in New Issue
Block a user