Allow enter relative to aiPath paths

[vanowm]

With this change only autoit.aiPath is required, all other paths can be left blank, in which case will use default, relative to autoit.aiPath path. It also allows specify relative paths (x:\ considered as full path). If entered path ends without \ it considered path of executable (for the exeption of autoit.includePaths), otherwise default executable name will be appended.

[vanowm]

Am I doing it right? I checkout a branch that I want to bring up-to-date, then I merge it to the latest commit of master branch. In git graph it looks strange, the branch doesn't "join" to the same commit, it shows as separate commit...Or should I select the "up-to-date" commit and pull/merge outdated branch/commit to it?

[Danp2]

I think so. FWIW, I do this to sync up my repo's master branch --

git checkout master
git fetch upstream
git rebase upstream/master

Then you can check out your branch and update it from your local master branch --

git checkout <your branch>
git merge master