Gentoo Forums
Gentoo Forums
Gentoo Forums
Quick Search: in
Tip: Another nice merge tool for dispatch-conf: "git add -p"
View unanswered posts
View posts from last 24 hours

 
Reply to topic    Gentoo Forums Forum Index Documentation, Tips & Tricks
View previous topic :: View next topic  
Author Message
teika
n00b
n00b


Joined: 19 Feb 2011
Posts: 68
Location: japan

PostPosted: Thu Jul 26, 2012 11:54 am    Post subject: Tip: Another nice merge tool for dispatch-conf: "git ad Reply with quote

Hi. dispatch-conf has the option "merge" which lets you edit the diff. "git add -p" is a nice tool for that, even if you've never used git; the usage is easy, or completely self-explanatory. For a howto, go to the page dispatch-conf in the old gentoo wiki

You can test it by making two similar files /etc/foo and /etc/._cfg0000_foo.

# I confess that I've been using the ugly obsolete painful default, "sdiff" (It is quite difficult to understand, and learning such outdated tool is a complete waste of your life.) although I've been using Gentoo for 7 years. (Well, for the first 3 years or so it was etc-update.) Ouch.

Regards.
_________________
Easy Shift / Ctrl / AltGr ... hack; save your pinkies, type without drudge: topic 865313
Back to top
View user's profile Send private message
Display posts from previous:   
Reply to topic    Gentoo Forums Forum Index Documentation, Tips & Tricks All times are GMT
Page 1 of 1

 
Jump to:  
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum