18 pager = LESS='FSRXi' less |
18 pager = LESS='FSRXi' less |
19 |
19 |
20 [alias] |
20 [alias] |
21 fetch = pull --rebase |
21 fetch = pull --rebase |
22 ctags = !~/bin/git-ctags |
22 ctags = !~/bin/git-ctags |
23 draft = log -r 'not public()' |
23 draft = log -r 'reverse(not public())' |
24 |
24 |
25 [merge-tools] |
25 [merge-tools] |
26 vimdiff.executable = vim |
26 vimdiff.executable = vim |
27 vimdiff.args = -d -c 'hid|hid' $base $local $output $other |
27 vimdiff.args = -d -c 'hid|hid' $base $local $output $other |
28 vimdiff.check = changed, conflicts |
28 vimdiff.check = changed, conflicts |