diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2023-09-15 20:11:53 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2023-09-15 20:12:50 +0100 |
| commit | 2086649ef18b9c4813d828b46c83efb4aab535f9 (patch) | |
| tree | a6456276535fd29c7b994a7edb0396612e306ca7 | |
| parent | ed2e253bcd747d55a7678e861392d37745989dad (diff) | |
| download | dotfiles-2086649ef18b9c4813d828b46c83efb4aab535f9.tar.gz | |
drop --refresh from QUILT_PUSH_ARGS
Otherwise we can't readily say 'quilt push -f'.
| -rw-r--r-- | .emacs.d/eshell/alias | 2 | ||||
| -rw-r--r-- | .profile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias index 008e258e..4ec89d25 100644 --- a/.emacs.d/eshell/alias +++ b/.emacs.d/eshell/alias @@ -28,4 +28,4 @@ alias date *date $* # We could just export the environment variables, but this should restrict the # colouration to commands run interactively, not others buried in scripts. alias git git -c color.ui=always $* -alias quilt QUILT_DIFF_ARGS="-p ab --color=always" QUILT_PUSH_ARGS="--refresh --color=always" quilt $* +alias quilt QUILT_DIFF_ARGS="-p ab --color=always" QUILT_PUSH_ARGS=--color=always quilt $* @@ -37,7 +37,7 @@ QUILT_NO_DIFF_INDEX=t; export QUILT_NO_DIFF_INDEX QUILT_NO_DIFF_TIMESTAMPS=t; export QUILT_NO_DIFF_TIMESTAMPS QUILT_DIFF_ARGS="-p ab --color=auto"; export QUILT_DIFF_ARGS QUILT_REFRESH_ARGS="-p ab"; export QUILT_REFRESH_ARGS -QUILT_PUSH_ARGS="--refresh --color=auto"; export QUILT_PUSH_ARGS +QUILT_PUSH_ARGS=--color=auto; export QUILT_PUSH_ARGS QUILT_DELETE_ARGS="-n -r"; export QUILT_DELETE_ARGS QUILT_DIFF_OPTS=-p; export QUILT_DIFF_OPTS |