1. Check for file that is having conflict

 git status

2. Edit code that has conflict and git add

 git add -a 

3. Commit edit

git commit -am "Some message" 

Global git ignore

echo ".DS_Store" >> ~/.gitignore
git config --global core.excludesfile ~/.gitignore

My info

git config --global user.name "Your Name Comes Here"
git config --global user.email you@yourdomain.example.com

Colorized outputs

git config --global color.branch auto
git config --global color.diff auto
git config --global color.interactive auto
git config --global color.status auto

class apt {

    file { '/etc/cron.daily/package.list':
        owner   => root,
        group   => root,
        mode    => 755,
        source  => "puppet:///files/etc/cron.daily/package.list"
    }

    file { "/etc/apt/sources.list":
        owner   => root,
        group   => root,
        mode    => 644,
        source  => $lsbdistcodename ? {
            "squeeze"   => "puppet:///files/etc/apt/sources.list.squeeze",
            default     => "puppet:///files/etc/apt/sources.list.squeeze"
        }
    }

    file { '/etc/apt/apt.conf.d/10puppet' :
        ensure  => present,
        owner   => root,
        group   => root,
        mode    => 644,
        source  => "puppet:///files/etc/apt/apt.conf.d/10puppet"
    }

    file { '/usr/local/sbin/check-updates':
        owner   => root,
        group   => root,
        mode    => 755,
        source  => "puppet:///files/usr/local/bin/check-updates"
    }

    exec { 'apt-update':
        command     => "/usr/bin/apt-get -qq update",
        logoutput   => false,
        refreshonly => true,
        subscribe   => [File["/etc/apt/sources.list"]]
    }

}

:w !sudo tee %

grep "from=<foo@example.com>" /var/log/mail.log | awk '{if ($6 != "NOQUEUE:"){print $6}}' | sed 's/\://g' | while read SEARCH; do grep "${SEARCH}" /var/log/mail.log; done | grep "to=" | awk '{print $7}' | sed -r 's/^to=<(.+)>\,$/\1/g' | uniq

Here is a step by step walkthrough of whats going on

1. We grep the from address out of the mail log
2. Pipe the output to awk and get the 6th column which is the mail id, if the 6th column doesn't start with NOQUEUE print the output
3. The output goes to sed which removes the ":" and
4. Read the output and put it into a variable and from that variable go through the mail log again
5. This time filter out the "to=" line from the mail log and print out the 7th column (which is the to address)
6. Use sed to filter out the to=<> line to print out the actual email addresses
7. Pass it through uniq to make sure there are no dupes

OUTF=rem-duplicates.sh;
echo "#! /bin/sh" > $OUTF;
find "$@" -type f -print0 |
xargs -0 -n1 md5sum |
sort --key=1,32 | uniq -w 32 -d --all-repeated=separate |
sed -r 's/^[0-9a-f]*( )*//;s/([^a-zA-Z0-9./_-])/\\\1/g;s/(.+)/#rm \1/' >> $OUTF;
chmod a+x $OUTF; ls -l $OUTF

rm ./'--exclude\=\*.svn'

Remember don't be an idiot like me

1. Retrieve the certificate.

$ echo "" | openssl s_client -connect server:443 > certificate

2. Check the expiration date of the certificate.

$ openssl x509 -in certificate -noout -enddate

Or you can use ssl-cert-check or check-expire

find . -type d -print | xargs chmod 755

But what happens if your folders have spaces? Using find that way will not escape the spaces instead the solution to this is to use find but in a slightly different manner

find . -type d -print0 | xargs -0 chmod 755

The -print0 tells find to terminate with zero so that whitespaces are recognized and the same goes for xargs as well.

aptitude search ~c | awk '{ print $2 }' | xargs aptitude -y purge

This will delete any packages that are not installed anymore which still has configuration files on the box