All Questions
18
questions
1
vote
1
answer
230
views
What is double plus mark in gitk?
git diff HEAD HEAD^2 shows a single +, but gitk shows 2, as in the following figure. I wonder why.
+ int k = 0;
+ for(; j < i; ++i){
+ for (k = 0; k < 1000; ++k){
++ if(groupids[k] =...
- 3,207
1
vote
0
answers
579
views
How to include added and removed files to a unified diff of a CL in perforce
I want to create a unified diff or patch using p4 describe -du or p4 diff2 -u, to apply later with patch utility. But the problem I encounter that these commands skip the content of added/removed ...
- 13
1
vote
1
answer
925
views
How to save diff output between two directories?
I'm running
diff -rq linux-4.15-rc9/ ubuntu-bionic/ > ubuntu.diff
but the output is just a bunch of lines with:
Files linux-4.15-rc9/tools/perf/util/metricgroup.c and ubuntu-bionic/tools/perf/...
- 11
1
vote
1
answer
636
views
patch file based off single line
i have a file:
unreliable, random content, multiple lines
this_line_is_always_the_same_and_never_repeated_in_file
unreliable, random content, SINGLE line
unreliable, random content, multiple lines
...
- 13
0
votes
1
answer
79
views
Why is my patch coming out in binary format?
I'm diffing two directories, 220 and sue, as follows:
diff -r 220 sue > diff.txt
The directory looks as follows afterwards:
$ ls -al
total 20
drwxrwx---+ 1 Administrators Domain Users 0 Jun ...
- 325
2
votes
1
answer
950
views
How to apply binary diff produced by fc to a file?
How can one apply diff file produced by fc /b command on Windows to update some file in a simplest way possible; i.e. without buying anything or downloading some large/questionable software?
The diff ...
- 131
3
votes
0
answers
1k
views
Patching .iso files
sometimes I have only little bandwidth. Also I have access to a machine with high bandwidth via ssh over the low bandwidth line.
So let's say, there's a new version of my favorite live system.
The ...
- 2,269
1
vote
0
answers
3k
views
How to only add lines using patch?
I'd like to be able to use diff & patch in order to write new lines to a file. To clarify what I mean a bit:
Original file: test1.repo
exclude=mongo*
exclude=sqlite*
exclude=postgresql*
New file:...
- 834
0
votes
1
answer
42
views
How do I get a good directory difffile I can use to patch/what to use for patch
I'd like to make a clean diff of a directory that allows me
to later use a gui patch program for windows to apply the diffile.
If possible I don't want to have to deal with hardcoded paths in the ...
- 123
1
vote
2
answers
3k
views
diff and patch tool
I'm trying to generate patches for a bunch of files I changed. I'm using Meld which does a great job of diff’ing the files in a nice visual manor, then it allows me to save and generate a patch file ...
- 1,059
1
vote
1
answer
122
views
How to patch something with diff output?
I want to apply the below changes to some code that someone has written and provided a diff output from. Is there a way given only the output below I can easily create a patch and apply it, or (as it'...
- 554
1
vote
1
answer
5k
views
Let diff create new files, but not remove existing files
Maybe I am missing something, but I'd like a diff between two directories to create files that don't exist, but not remove files that do. So, given something like:
./a/foo
./b/bar
This command:
...
- 113
0
votes
2
answers
259
views
An Application to describe .patch files
Do you know any application that be able to describe .patch files?
I mean an application that be able to get .patch file & give me a human readable of the changes it make on files so I'll be able ...
- 625
0
votes
2
answers
3k
views
Tool to create a patch that modifies/adds files within a directory structure
I have a set of files that need a set of changes applied to them.
In this scenario I have a Java Application Server (distributed via a zip file) that I need to apply a set of known configurations to, ...
- 1,702
2
votes
1
answer
387
views
Jump to file/line of current patch hunk in vim
If I'm viewing a multi-file diff in vim - for example the one produced by running :VCSDiff in a netrw buffer - and I position my cursor over a particular hunk, is there a way to jump to the affected ...
- 547