Commits

David Wolever  committed dbc7a15

Adding gitconfig

  • Participants
  • Parent commits 0c67578

Comments (0)

Files changed (3)

+[user]
+    name = David Wolever
+    email = david@wolever.net
+
+[color]
+    diff = auto
+    status = auto
+    branch = auto
+    ui = auto
+
+[core]
+    pager = 
+
+[alias]
+    ci = commit
+    di = diff
+    st = status
+    glog = log --graph --all
+    root = rev-parse --show-toplevel
+    serve = daemon --reuseaddr --base-path=. --export-all --verbose --enable=receive-pack --listen=0.0.0.0
+    echo = !"f() { echo \"Created branch '$1'\"; }; f"
+
+[difftool "sourcetree"]
+    cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+    path = 
+[mergetool "sourcetree"]
+    cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+    trustExitCode = true
+[push]
+    default = matching

File inkscape/preferences.xml

          id="rect"
          style="fill:blue;"
          usecurrent="1"
-         width="137"
-         height="102"
-         rx="0"
+         width="1555.6348876953125"
+         height="316.78384399414062"
+         rx="4"
          ry="0" />
       <eventcontext
          id="3dbox"
          open="0" />
       <eventcontext
          id="star"
-         magnitude="5"
+         magnitude="30"
          style="fill:yellow;"
          usecurrent="1"
-         proportion="0.5"
+         proportion="0.9000000171121042"
          rounded="0"
-         randomized="0" />
+         randomized="0"
+         isflatsided="0" />
       <eventcontext
          id="spiral"
          style="fill:none;"
        font_sample="AaBbCcIiPpQq12369$€¢?.;/()"
        show_sample_in_list="1"
        style="fill:black;fill-opacity:1;stroke:none;font-family:Museo Slab;font-style:normal;font-weight:normal;font-size:10px;line-height:125%;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:Museo Slab;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr"
-       selcue="1" />
+       selcue="1"
+       align_mode="0" />
     <eventcontext
        id="nodes"
        selcue="1"
        panel_wrap="0"
        x="0"
        y="0"
-       w="347"
+       w="329"
        h="432"
        state="2" />
     <group
        h="273" />
     <group
        id="transformation"
-       applyseparately="0" />
+       applyseparately="0"
+       panel_size="1"
+       panel_ratio="100"
+       panel_mode="1"
+       panel_wrap="0"
+       x="0"
+       y="0"
+       w="329"
+       h="184"
+       state="2" />
     <group
        id="align" />
     <group
        panel_ratio="100"
        panel_mode="1"
        panel_wrap="0"
-       x="33"
+       x="0"
        y="0"
        w="388"
        h="509" />
        w="233"
        h="414" />
     <group
-       id="object" />
+       id="object"
+       x="516"
+       y="292"
+       w="272"
+       h="463" />
     <group
        id="export"
        default=""
        default="org.inkscape.output.svg.inkscape"
        append_extension="1"
        enable_preview="1"
-       path="/Users/wolever/code/pyconca/pyconca/assets/video-splash-screen"
+       path="/Users/wolever/Dropbox/PyCon US 2013/Video Slides"
        use_current_dir="1" />
     <group
        id="save_copy"
-       default=""
+       default="org.inkscape.output.svg.inkscape"
        append_extension="1"
        enable_preview="1"
-       path="" />
+       path="/Users/wolever" />
     <group
        id="open"
        enable_preview="1"
-       path="/Users/wolever/code/pyconca/pyconca/assets/logo-files/" />
+       path="/Users/wolever/Dropbox/PyCon US 2013/Video Slides/" />
     <group
        id="import"
        enable_preview="1"
-       path="/Users/wolever/Downloads/" />
+       path="/Users/wolever/Dropbox/PyCon US 2013/LOGOS/PyCon_2013_Diamond/Heroku/" />
     <group
        id="debug"
        redirect="0" />
        panel_wrap="0"
        x="0"
        y="0"
-       w="329"
+       w="331"
        h="197"
        state="2" />
     <group
     <group
        id="colorpickerwindow" />
     <group
-       id="undo-history" />
+       id="undo-history"
+       panel_size="1"
+       panel_ratio="100"
+       panel_mode="1"
+       panel_wrap="0"
+       state="2"
+       x="0"
+       y="0"
+       w="324"
+       h="101" />
     <group
        id="filtereffects" />
     <group
        state="2"
        x="0"
        y="0"
-       w="341"
+       w="329"
        h="509" />
+    <group
+       id="svgfonts"
+       panel_size="1"
+       panel_ratio="100"
+       panel_mode="1"
+       panel_wrap="0"
+       state="2"
+       x="0"
+       y="0"
+       w="405"
+       h="482" />
   </group>
   <group
      id="printing">
   <group
      id="extensions"
      org.inkscape.input.gdkpixbuf.png.link="embed"
-     org.inkscape.input.gdkpixbuf.jpg.link="link" />
+     org.inkscape.input.gdkpixbuf.jpg.link="embed" />
   <group
      id="desktop"
-     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;-inkscape-font-specification:Museo Slab;font-family:Luxi Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:18px;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%;stroke-dashoffset:0;opacity:1;fill-opacity:1;stroke-linejoin:miter">
+     style="fill:#ffffff;stroke:none;stroke-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;-inkscape-font-specification:League Gothic;font-family:League Gothic;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:56px;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%;stroke-dashoffset:0;opacity:1;fill-opacity:1;stroke-linejoin:miter">
     <group
        width="1280"
        height="752"
-       x="0"
-       y="0"
+       x="14"
+       y="9"
        fullscreen="0"
        id="geometry"
        maximized="0" />
 
 alias glog="vs glog | less"
 alias viq="vim \$(vs root)/.\$(vsname)/patches/series"
-for vscmd in tip qimport qser qpo qpop qpu qpush qfin qref qnew qrm qmv di ci qdi st rebase pull nudge sum co bm
+for vscmd in tip qimport qser qpo qpop qpu qpush qfin qref qnew qrm qmv di ci qdi st rebase pull nudge sum co bm log
 do
     alias $vscmd="vs $vscmd"
 done