Mercurial > dotfiles

comparison .hgrc @ 243:5fdca3153e75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: upstream bookmarks alias
author Augie Fackler <durin42@gmail.com>
date Wed, 13 Apr 2011 10:31:23 -0500
parents b742c194dba3
children 3fd758a51947
comparison
equal deleted inserted replaced
242:1ba5a7b0a328 243:5fdca3153e75
22 filemerge.executable = opendiff-w 22 filemerge.executable = opendiff-w
23 filemerge.args = $local $other -ancestor $base -merge $output 23 filemerge.args = $local $other -ancestor $base -merge $output
24 24
25 [alias] 25 [alias]
26 ll=log --graph -l 6 26 ll=log --graph -l 6
27 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n'
27 28
28 [ui] 29 [ui]
29 username = Augie Fackler <durin42@gmail.com> 30 username = Augie Fackler <durin42@gmail.com>
30 style = compact 31 style = compact
31 ignore = ~/.hgglobalignore 32 ignore = ~/.hgglobalignore