From 8177dae2737f44504c3e4ce5b5198e7ec7a93c30 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Sat, 7 Jul 2012 00:57:23 -0400
Subject: Add gfrop command

---
 .zshrc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.zshrc b/.zshrc
index d4a85846..3a38aea6 100644
--- a/.zshrc
+++ b/.zshrc
@@ -143,6 +143,12 @@ alias irb='ripl'
 alias l='ls'
 alias t='task'
 
+function gfrop {
+git fetch
+git rebase origin/master
+git push origin master
+}
+
 setopt PROMPT_SUBST
 
 function prompt_task {
-- 
cgit 1.4.1

e='4ec42616876188657fde1230f7c2ccd8396f18b1'/><input type='hidden' name='showmsg' value='1'/><select name='h' onchange='this.form.submit();'>
<option value='ce1dd27209c4a292d4ee7e0254c026ceb5253699'>this commit</option>
<optgroup label='branches'><option value='master' selected='selected'>master</option>
</optgroup></select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>dontfiles
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/src/'>summary</a> <a href='/src/refs/?id=4ec42616876188657fde1230f7c2ccd8396f18b1'>refs</a> <a class='active' href='/src/log/bin/wake.c?showmsg=1&amp;follow=1'>log</a> <a href='/src/tree/bin/wake.c?id=4ec42616876188657fde1230f7c2ccd8396f18b1'>tree</a> <a href='/src/commit/bin/wake.c?id=4ec42616876188657fde1230f7c2ccd8396f18b1&amp;follow=1'>commit</a> <a href='/src/diff/bin/wake.c?id=4ec42616876188657fde1230f7c2ccd8396f18b1&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/bin/wake.c'>
<input type='hidden' name='id' value='4ec42616876188657fde1230f7c2ccd8396f18b1'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=4ec42616876188657fde1230f7c2ccd8396f18b1&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/src/log/bin?id=4ec42616876188657fde1230f7c2ccd8396f18b1&amp;showmsg=1&amp;follow=1'>bin</a>/<a href='/src/log/bin/wake.c?id=4ec42616876188657fde1230f7c2ccd8396f18b1&amp;showmsg=1&amp;follow=1'>wake.c</a> (<a href='/src/log/bin/wake.c?id=4ec42616876188657fde1230f7c2ccd8396f18b1&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/wake.c?id=4ec42616876188657fde1230f7c2ccd8396f18b1&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2019-01-12 14:20:39 -0500'>2019-01-12</span></td><td class='logsubject'><a href='/src/commit/bin/cash/libedit/Makefile?id=cde3b42942dac28debaf39280f48e0249c18232a&amp;follow=1'>Replace libedit Makefile</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2019-01-11 17:38:59 -0500'>2019-01-11</span></td><td class='logsubject'><a href='/src/commit/bin/cash/libedit/vi.c?id=5e38f3a7eada1c037038dc7e0af8611265698f5c&amp;follow=1'>Import /usr/src/lib/libedit from NetBSD 8.0</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2019-01-11 13:59:39 -0500'>2019-01-11</span></td><td class='logsubject'><a href='/src/commit/bin/cash/var.c?id=e9af3c7681723244c0ca305d8cc540ad4540ca80&amp;follow=1'>Add PSlit for prompt escapes</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2019-01-11 12:41:54 -0500'>2019-01-11</span></td><td class='logsubject'><a href='/src/commit/bin/cash/Makefile?id=93f635b0e9edad7e3b9a832fbbfb5708a60d4507&amp;follow=1'>Don't make depend automatically</a></td><td>June McEnroe