I like the output of
Code:
git diff --color-words old..new
but I do not know how to set --color-words permanently in the ~/.gitconfig file.
Edit: I guess I should've said that I do not want an alias for diff --color-words
I have centos 5.29 on one hard drive in a box and now someone wants to hook up his own XP Hard drive every now and then when I am not using centos.
Rather than have to disconnect everytime, is there a way I can have the 2 drives in the box and have the option at bootup which one to use?
when i compile a software ABySS, it reported that:
/usr/local/include/google/sparsehash/libc_allocator_with_realloc.h:66: warning: unused parameter 'n'
make[2]: *** [libalign_a-Aligner.o] Error 1
make[2]: Leaving directory `/var/data/abyss-1.2.0/Align'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/var/data/abyss-1.2.0'
make: *** [all] Error 2
someone said it because of a bug of google-sparsehash. and gave a patch "deallocate.diff ". my problem is how to use deallocate.diff to fix the bug.
When I build my software with rpmbuild command, the rpms are not gettinggenerated in the directory specified in rpmmacros file(%_rpmdir)This is what I am doing..
rpmbuild -bb -vv --buildroot <build root path> --target=x86_64 --rcfile /tmp/rpmrc /tmp/mySpecfile.spec
# cat /tmp/rpmrc
[code]....
Does diff not like arrays? How do achieve the following?
Code:
stuart@stuart:~/music transfer$ diff file1.txt file2.txt
1c1
< bonkers_in_phoenix.mp3
[code]....
I downloaded a package with an extension .diff.gz. I extracted it and got a .diff file. how to install a .diff file?
View 1 Replies View Related1/ I haven't catch the difference between dwdiff, diff or dircomp If one wants to only output files (JPEG, doc, etc.), which have been created, absent or modified The command:
diff -r -q
works well, any advantage for another command? Subtilities between commands for issues like:
* identical content, but renamed files
* identical names & date & weight, but different content (virus)
2/ Is there a way to tell diff to store in a specific directory all missmatched files?
Something as
diff - r -q oldBackup actualData /media/sda1/discrepant
Where diff would store in media/sda1/discrepant all files which are new or modified after comparison between oldBackup and actualData
I would like to compare the (screen) output of one bash script with the (screen) output of another bash script to ensure the output is exactly the same.The reason for this is that I am receiving a consolidated data feed from an IP address and have moved some of the data feed to a 'new' source IP address. I will turn off the feed from the original once satisfied that the new is receiving the same data. The format of the output from the scripts are exactly the same.
Tried so far
./IDCGRE.sh | grep FX.CK | diff < ./IDCGRE2.sh
./IDCGRE.sh | grep FX.CK | ./IDCGRE2.sh | diff
[code]...
I have two H/D and i need to install XP and RHEL5.3 in different H/D connected to single machine.so that when i boot from first H/D linux will boot or if i choose second XP will boot.
View 7 Replies View RelatedWhere can i find such subj? I don't see that standart diff supports such feature. It will be used for backup big directory like /home. Because directory is too big so repositories like svn are unacceptable. Good case seems to be diff+tar.gz to save differences for last n-th monthes for example. /home could contain doth hard and symbolic links that are not resolvable on backup machine but could have sense at all (= be resolvable on other machines where /home is used too via nfs mounting).
View 4 Replies View RelatedI would like to make a one-liner, which diff's "ps aux" output before and after killing a process. So basically it should be a combination of fallowing commands:
1) diff -u
2) ps aux | awk '{print $2}'
3) kill `ps aux | grep [c]ron | awk '{print $2}'`
4) ps aux | awk '{print $2}'
How to achieve this? Something like this:
Code:
diff $( kill `ps aux | grep [c]ron | awk '{print $2}'` && ps aux | awk '{print $2}' ) $( ps aux | awk '{print $2}' )
I don't have pgrep or pkill available.
I have 500 folders of templates in one folder. Now each folder has file called template_thumbnail.png . now i want something so that all those files get copied to one folder with name same as the home folder name
I have cygwin installed and i can copy that folder in there so basically it will linux shell script
My Friend and I have a similar spec PC apart from mine has 4GB DDR2 his 2GB DDR2 and Mine quad core 2.3Ghz and his Dual core 2.3Ghz.... Both on a fresh 10.04 install with Grub2
Bootchart beats mine by about 10sec why?[Files Attached]
Edit files here: (Attached got resized)
Mine : [URL]
Friend : [URL]
I'm new to scripting and I have a trouble with if statement syntax. The code is: Code: #there is a diff command here, and it does what i want but#i wanna see 1 if the exit value of diff is 0, and otherwise i wanna see 0.#the problem is here: (syntax error near unexpected token "then")
if["$?"==0];
then
echo 1
[code].....
I have Fedora in dual boot with windows on a laptop. I have a weird clock problem. If I get the clock set correctly in Fedora, then it's 4 hours too fast in Windows. When I fix it in Windows and then restart into Fedora, it's 4 hours too slow in Fedora!Why are they competing with each other and how do I get them to both be correct?
View 6 Replies View RelatedI have a program that writes to stdout. Is there a way that I can redirect the output to the linux diff command or do I have to write the output to a file and then compare that. For example I have a bunch of test input files for a program and the corresponding expected output in another set of files. And I'd like to do something like ./program < t1.input | diff t1.expected.
View 3 Replies View RelatedIn gnome terminal it is possible to open multiple tabs with Quote:$ gnome-terminal --tab-with-profile=jake_lardasset --tab-with-profile=virtualsexgranny -x alpineWe got even further....Quote:gnome-terminal --tab-with-profile=james_treesexer --command pymol --tab-with-profile=loverboy13 --command alpineand pymol runs, but not in the tab and alpine runs in the tab.The problem is, that when using a script to check mail it has Quote:gnome-terminal --tab-with-profile=chrissypink --command alpine --tab-with-profile=jake_hugerichard -x ssh xxxx@xxxx.ut.eenot the other way aroundIs there a simpler way to do this?And why is it not possible to execute ssh with the --command parameter and -x has to be used ,but top and so on can be executed with --command
View 2 Replies View Relatedinstall immunity debugger on system and found it very diff?
View 2 Replies View Relatedi tried using diff --GTYPE-group-format= with <%, but not sure that right solution.Here's what im trying to do. I have two c source files, file1 and file2. file1 has a function in it that's been modified in file2. However, the functions begin at differnt line numbers in eachof the files. Is there a way to specify a range of file numbers on file1 and file2 to compare, using diff or any other combination of utilities? I can always output text from a range of lines from each file to two separate and new files and then compare those, but that's tedious. I could also write up a script to automate this type of solution, but I imagine there's an existing way of doing this.
View 1 Replies View RelatedI'm writing a script using ksh that diffs two dirs that contain about 30 files, and writing the results on a logfile. When files differ, it writes the difference with no problem, but I also need the script to write a message if no differences are found.
View 3 Replies View RelatedI' d like to apply this patch into my squeeze: [URL] Can someone pls explain howto apply driver diff patch into a custom kernel?
View 9 Replies View RelatedI am not especially cli adept so could someone tell me the best way to use the diff command to get the difference between a string of text and the contents of a file instead of between the contents of two files?
View 3 Replies View RelatedIs it possible for me to copy the A150 install to a completely different laptop?I have the A150 setup the way I want it with packages and synaptics, and I want to copy it's install over to a medion laptop.
View 4 Replies View RelatedI need to compare 2 files using diff. The problem I've encountered is that I need to exclude certain lines that contain certain phrases. I know that diff supports the -I switch but no matter how I try to form the regexp it doesn't seem to work the way I expect it to. If anyone has used the -I switch before could you please post some examples of how it is used.
diff -I "[skipthisline]" file1 file2 > output.diff
I need to exclude lines that contain the string "[skipthisline]" but I have no idea what syntax is used after the -I switch. Is is supposed to be included in quotes or slashes /[skipthisline]/ or entered without either? I need to include a backslash before each bracket so that it's not interpreted as a set of characters like [a-z] but is instead interpreted as a string. Do I need to use 2 backslashes? "\[skipthisline\]"
Is it sufficient to simply type the string I want to match or do I need to match the entire line in order to exclude it from the output?
.*[skipthisline].*
or
^.*[skipthisline].*$
I am trying to set up dual monitors in Ubuntu, with the two monitors having different resolutions. One monitor is on my laptop and the other is an external monitor. I have seen a number of threads detailing this.
1. Talks about editing xorg.conf.- The problem here is that i don't seem to have an xorg.conf file in /usr/share/X11. When i
Quote:
locate xorg.conf
in the terminal i get:
Quote:/usr/share/X11/xorg.conf.d
/usr/share/X11/xorg.conf.d/10-evdev.conf
/usr/share/X11/xorg.conf.d/11-evdev-quirks.conf
[Code]...
2. Talks about editing xrandr, linking to this page [URL]..This looks incredibly intimidating and i can't really work out what to do in my case.
3. Try changing resolution on one of the monitors in ~/.config/monitors.xml, which is where i got the unity dock to only show on the primary monitor. - Here, after i saved and logged out and in, i got an error msg saying the the resolution wouldn't work. When i looked at ~/.config/monitors.xml, the resolutions had reverted back to what they were originally.
4. I have tried 'configure display settings' in 'monitor preferences'. Here i can change the resolution of each monitor quite easily. This works and the resolution is perfect. The problem though is once i have done this monitor on my laptop - the one with the higher resolution - behaves really strangely. When i close things they don't disappear off the screen, the unity dock smears on the screen when it minimizes and mouse pointer labels show up and then don't disappear.
In GNU/Linux and going for my RHCE. But from few yrs i have been using UBUNTU . So the thing is I have installed my FTP in Redhat and I get a ftp folder in /var folder,and it is simple to configure and use. But I am not able to get a proper help and also proper configuration procedure for Creating a FTP server on my UBUNTU workstation.I'm using Ubuntu 10.04.
View 3 Replies View RelatedThe difference between: service httpd start & /etc/init.d/httpd start.
View 3 Replies View RelatedI would like to install 7zip with Synaptics.When I search for "7zip" in Synaptics then a couple of entries are listed e.g.p7zipp7zip-fullWhat is the difference?Which one should I take?7zip should be available from context menu of Nautilus file browser and from cmdline
View 2 Replies View RelatedI have changed my background color of xterm/konsole to black (better for eye since i got to face monitor for long hour).In my vi file, there is a color setting to put all comment # with deep blue color. This make it very difficult to see if the blackground color is black color. How could i change color setting in vi or vim ? I want to change the blue color to cyan.
View 8 Replies View RelatedWhen I login remotely with PuTTy, I can type dir --color=always and it will give me that particular directory listing in color, but then the next one is not in color (the color setting does not stick).I have tried:dir --color=yesdir --color=forcedir --color=always
View 7 Replies View Related