GithubHelp home page GithubHelp logo

zhangga / tortoisegit-excelcomparison Goto Github PK

View Code? Open in Web Editor NEW

This project forked from tsworman/tortoisegit-excelcomparison

0.0 1.0 0.0 13 KB

A script for using MS Office Spreadsheet Comparison 2016 (or 365) with TortoiseGit (or SVN)

VBScript 34.30% Batchfile 65.70%

tortoisegit-excelcomparison's Introduction

TortoiseGit-ExcelComparison

About

This script enables you to compare (in a meaninful way) data between two XLSX spreadsheets. It's designed for use with TortoiseGit and it should work with TortoiseSVN.

This was originally found here: https://www.cnblogs.com/micele/p/5014037.html

I modified it to more closely match the latest TortoiseGit scripts and to get it working with Spreadsheet compare 2016 and Office 365.

How to Install

Download the .vbs file and place it in: C:\Program Files\TortoiseGit\Diff-Scripts (or wherever you have TortoiseGit Installed)

Launch TortoiseGit settings (right click on desktop, TortoiseGit->Settings) and pick Diff Viewer.

Under diff viewer pick advanced.

Find the existing xslx entry and delete or change the extension for it. I renamed the existing entry to .xslx2 so that I could still use the original functionality if needed by simply renaming my files.

Add a line for .xslx and set it to: wscript.exe "C:\Program Files\TortoiseGit\Diff-Scripts\diff-xlsx-ssc.vbs" %base %mine //E:vbscript

How to use

Assuming you have spreadsheet compare 2016 (or Office 365) installed, it should launch when you perform a diff from TortoiseGit.

Spreadsheet Compare will simply tell you what changed between files. It has no facilities to perform the merge of the changes.

You can use this to manually update your working copy, mark conflicts as resolved, and perform a manual merge-commit.

git/svn都可用

新版本的windows已经自带Spreadsheet Compare插件了,在搜索栏能搜索到。所以vbs脚本里改成了windows默认的快捷方式.

新增bat文件,直接下载,右键管理员运行即可。

tortoisegit-excelcomparison's People

Contributors

zhangga avatar tsworman avatar mo-gul avatar

Watchers

James Cloos avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.