diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-10-27 17:00:55 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-10-27 17:00:55 -0400 |
commit | 7446e75b8b6c09e80af3b6b02f44e69e0d2e250d (patch) | |
tree | 523911d00ea200d72c5630e74918dd05fab8fd47 /.gitignore | |
parent | 0e4dd67aae8b10032317a29a6bd99d2d4a64c897 (diff) | |
download | emacs-7446e75b8b6c09e80af3b6b02f44e69e0d2e250d.tar.gz |
* .gitignore: Don't ignore .rej files
Left over rejected hunks that we forgot to merge by hand should not be
silently ignored. Better explicitly remove/rename .rej files when
done with them.
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index e75df8b8b61..389fb450d86 100644 --- a/.gitignore +++ b/.gitignore @@ -251,7 +251,6 @@ gnustmp* # Version control and locks. *.orig -*.rej *.swp *~ .#* |