hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject [3/3] hive git commit: HIVE-16501 : Add rej/orig to .gitignore ; remove *.orig files (Zoltan Haindrich via Ashutosh Chauhan)
Date Tue, 25 Apr 2017 15:45:55 GMT
HIVE-16501 : Add rej/orig to .gitignore ; remove *.orig files (Zoltan Haindrich via Ashutosh
Chauhan)

Signed-off-by: Ashutosh Chauhan <hashutosh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c911f420
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c911f420
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c911f420

Branch: refs/heads/master
Commit: c911f42035d9e7b91191e2683f85d8fd2a35eb27
Parents: f1e0b4f
Author: Zoltan Haindrich <kirk@rxd.hu>
Authored: Tue Apr 25 08:45:10 2017 -0700
Committer: Ashutosh Chauhan <hashutosh@apache.org>
Committed: Tue Apr 25 08:45:10 2017 -0700

----------------------------------------------------------------------
 .gitignore                                      |     2 +
 .../hive/ql/parse/CalcitePlanner.java.orig      |  4188 -----
 .../hive/ql/parse/SemanticAnalyzer.java.orig    | 13508 -----------------
 3 files changed, 2 insertions(+), 17696 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/c911f420/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 47c59da..8578a64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ hcatalog/webhcat/svr/target
 conf/hive-default.xml.template
 itests/hive-blobstore/src/test/resources/blobstore-conf.xml
 .DS_Store
+*.rej
+*.orig


Mime
View raw message