From 1da62670810ccb26988c676982ab29d3f407183f Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 14 Jun 2008 13:07:58 +0200
Subject: In update: fetch once, then for each branch (crate and) merge.

---
 make/git.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/make/git.mk b/make/git.mk
index f8436f8..068e7f3 100644
--- a/make/git.mk
+++ b/make/git.mk
@@ -11,8 +11,10 @@ currentbranch = $(shell git branch | grep ^\* | awk '{ print $2 }')
 noncurrentbranches = $(filter-out $(currentbranch),$(branches))
 
 update:
-	$(if $(filter $(currentbranch),$(master)),,git checkout "$(master)")
-	git pull
+	git fetch $(origin)
+	$(if $(filter $(currentbranch),$(master)),,git branch -f "$(master)" "$(origin)/$(master)" && git checkout "$(master)")
+	git merge --no-commit "$(origin)"
+	$(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git merge --no-commit "$(origin)" &&) git checkout "$(master)")
 
 init:
 # Assume that initial cloning is done already when invoking this target
-- 
cgit v1.2.3

ass='sub'>Unnamed repository; edit this file 'description' to name the repository.</td><td class='sub right'>Jonas Smedegaard</td></tr></table>
<table class='tabs'><tr><td>
<a href='/notmuch/?h=master'>summary</a><a href='/notmuch/refs/?h=master'>refs</a><a href='/notmuch/log/tags/3b/a0/540A035D.1010003@pocock.pro?h=master'>log</a><a href='/notmuch/tree/tags/3b/a0/540A035D.1010003@pocock.pro?h=master'>tree</a><a class='active' href='/notmuch/commit/tags/3b/a0/540A035D.1010003@pocock.pro?h=master'>commit</a><a href='/notmuch/diff/tags/3b/a0/540A035D.1010003@pocock.pro?h=master'>diff</a></td><td class='form'><form class='right' method='get' action='/notmuch/log/tags/3b/a0/540A035D.1010003@pocock.pro'>
<input type='hidden' name='h' value='master'/><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='/notmuch/commit/?h=master'>root</a>/<a href='/notmuch/commit/tags?h=master'>tags</a>/<a href='/notmuch/commit/tags/3b?h=master'>3b</a>/<a href='/notmuch/commit/tags/3b/a0?h=master'>a0</a>/<a href='/notmuch/commit/tags/3b/a0/540A035D.1010003@pocock.pro?h=master'>540A035D.1010003@pocock.pro</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='master'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Jonas Smedegaard &lt;dr@jones.dk&gt;</td><td class='right'>2023-06-27 09:35:08 +0200</td></tr>
<tr><th>committer</th><td>Jonas Smedegaard &lt;dr@jones.dk&gt;</td><td class='right'>2023-06-27 09:35:08 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/3b/a0/540A035D.1010003@pocock.pro?h=master&amp;id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>fd54908da2b05c526dd3bee9b6dcd093214a220d</a> (<a href='/notmuch/patch/tags/3b/a0/540A035D.1010003@pocock.pro?id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/notmuch/tree/?h=master'>c69c845069c99d1d01044f6fafda7c08433329c6</a> /<a href='/notmuch/tree/tags/3b/a0/540A035D.1010003@pocock.pro?h=master'>tags/3b/a0/540A035D.1010003@pocock.pro</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/3b/a0/540A035D.1010003@pocock.pro?h=master&amp;id=ba46132213560cf3335d53560d519c0ec0190da2'>ba46132213560cf3335d53560d519c0ec0190da2</a> (<a href='/notmuch/diff/tags/3b/a0/540A035D.1010003@pocock.pro?h=master&amp;id2=ba46132213560cf3335d53560d519c0ec0190da2'>diff</a>)</td></tr></table>
<div class='commit-subject'><span class='decoration'><a class='branch-deco' href='/notmuch/log/tags/3b/a0/540A035D.1010003@pocock.pro?h=master'>master</a></span></div><div class='commit-msg'></div><div class='diffstat-header'><a href='/notmuch/diff/?h=master'>Diffstat</a> (limited to 'tags/3b/a0/540A035D.1010003@pocock.pro')</div><table summary='diffstat' class='diffstat'>