From 0507e505d003a891c72a4d897fc2fe91b2aa607a Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Thu, 19 Sep 2019 09:39:14 -0400
Subject: [PATCH] ARROW-6591: [R] Ignore .Rhistory files in source control
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While working on [ARROW-6337](https://issues.apache.org/jira/browse/ARROW-6591), I saw that `.Rhistory` files are not currently ignored in arrow's `.gitignore`. They serve no purpose to the project so I think they should probably be ignored.

Closes #5415 from jameslamb/misc/rhistory and squashes the following commits:

cde2d71fe <James Lamb> ARROW-6591:  Ignore .Rhistory files in source control

Authored-by: James Lamb <jaylamb20@gmail.com>
Signed-off-by: François Saint-Jacques <fsaintjacques@gmail.com>
---
 .gitignore      | 7 +++++--
 r/.Rbuildignore | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bad26c4207849..096862b41838c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,11 +58,14 @@ python/doc/
 .idea/
 .pytest_cache/
 pkgs
-.Rproj.user
-arrow.Rcheck/
 docker_cache
 .gdb_history
 .DS_Store
 *.orig
 
 site/
+
+# R files
+**/.Rproj.user
+**/*.Rcheck/
+**/.Rhistory
diff --git a/r/.Rbuildignore b/r/.Rbuildignore
index 0e2a80daac548..8f0680510bedf 100644
--- a/r/.Rbuildignore
+++ b/r/.Rbuildignore
@@ -20,3 +20,4 @@ clang_format.sh
 ^.*\.cmd$
 ^autobrew$
 ^apache-arrow.rb$
+^.*\.Rhistory$