git diff - Configuring multiple git mergetool and difftool so that appropriate tool will be chosen based on extension -


When I difftool git, then it runs the default difftool for all files I select the appropriate difftool based on expansion Wrote a script for and I call in the script like git difftool -t mytool. Difftool redirects all the logic to all columns, which is good though, it redirects all file names in any way as well. So basically, my script gets useless because the custom futulto is replaced with all the files that change.

What do I have to do, limit difftool to a file, or call my install with at least one file, not the rest. Actually, this is my script and I have the default difftool as in .gitconfig. 

  if_sbs $ 1 $ 2; So #custom difftool which is also defined in the text after .gitconfig Git DT T tune the rest #for all files Git DT tax kdiff3 Fi

Apparently, git naturally pipe all file information and it is not shown in logic for the script. Instead of defining other diff tools in .gitconfig as "difftool", I have called the executable file with the proper arguments. The complete solution is the following:

.gitconfig 

  [difftool] expedited = false [mergetool] prompt = false [difftool "selectiveDiff"] cmd = difftool.sh $ local $ REMOTE $ base $ merger keepBackup = false [mergetool "selectiveMerge"] cmd = mergetool.sh $ local $ REMOTE $ base $ merger keepBackup = false

Please note Keep that script should be in PATH. Either make a directory and add it to your path or use one that is already in PATH

Define the variable in anywhere 

  RHAPSODY_PATH = "C: / program files (x86) /IBM/Rational/Rhapsody/8.0.5/DiffMerge.exe "KDIFF3_PATH =" C: / program files / KDiff3 / kdiff3.exe "

Difftool.sh 

  if_sbs $ 1 $ 2; So "$ RHAPSODY_PATH" -Base $ 3 $ 1 $ 2 -xcompare else "$ KDIFF3_PATH" $ 1 $ 2 fi

mergetool.sh 

  if_sbs $ 1 $ 2; So -base based file1 file2 out output -xmerge "$ RHAPSODY_PATH" # DiffMerge.exe $ 3 $ 1 $ 2 out of $ 4 -base -xmerge rest # kdiff3 based file1 file2 -o output "$ KDIFF3_PATH" $ 3 $ 1 $ 2 -o $ 4 fi

This will select the right frame and merge tool on the call.


-

Comments

Post a Comment

Popular posts from this blog

sqlite3 - UPDATE a table from the SELECT of another one -

I have the first table article where some data is missing. In the table, articles_tmp I have a part of the missing data. So I want to update the articles. Where the path path is data in articles_tmp.path where the path is not zero . With SQLite , it does not work: update article SET path = (SELECT at.path FROM Articles_tmp as AS, WHERE at.article_id = a.id and a.asp, the text is in the form and not on. It has been transmitted) where the path is null MS Access Along with, it works fine: Update Articles Join the Inner Articles at articles_tmp articles.id = articles_tmp.id SETP articles.path = articles_tmp.path Can anyone help? Sin CE SQL Server Syntax, which I provided, was not working, here this solution With whom I have come. A little modification of your original query, but with my "correlation" suggestion added. There is a SQL Bella for this: Here is the code: update article SET path = (SELECT path from articles_tmp AS T WHERE t.id
Read more

c# - Showing a SelectedItem's Property -

So I have enabled a rightclick option for my DataGrid. I want to display the only chosen property but it is not behaving like what I would like it to display my name and additional. Public category Paymentinfo {public int PaymentNo {get; Set; } Public string date {get; Set; } Public Double Pay {get; Set; } Public Double Principle {get; Set; } Public Double Interest {get; Set; } Public Double Balance {Received; Set; }} Private Zero MenuItem_OnClick (Object Sender, RoutedEventArgs e) {MessageBox.Show (AmortGrid.SelectedItem.ToString ()); } I'm trying to apply it without using a View Module! If I place a breakpoint where the messagebox and the recipient place it on selected ITEM, then this property will display the payment. A date-payment-principle-interest-balance is the only value that needs payment. Was hoping that it would be something like this MessageBox.Show (AmortGrid.SelectedItem.PaymentNo.ToString ()); When you call ToString () So you get the class typ
Read more

javascript - Render HTML after each iteration in loop -

I'm trying to gradually increase the font size of text on a web page. The code works in my place, although the new HTML / CSS does not render after every iteration of the loop and when all this is done, then display only the text of 100 px size. To see the text as if it is slowly zooming, I need to do this JavaScript is down because it is being used from a different file here is what I have ... < Pre> & lt; P class = "game-title" style = "font-size: 50px" & gt; Test & lt; / P & gt; Function sleep (milliseconds) {var start = new date (). GetTime (); For (var i = 0; i & lt; 1e7; i ++) {if ((new date). GetTime () - start) & gt; Milliseconds {break; CSS ('font-size', 'parseInt ($ (' game-title '). CSS (' font-size ')) + 1 + "pixels"); } While (parasont ($ ('# text'). Css ('font-size')) & lt; = 100) {sleep (1000); IncreaseSize (); Using CSS: Use of jQuery (sample):
Read more