From 4f4519b1f9a02744004f0bd547675a3ece891f93 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 4 Aug 2008 04:23:57 +0200
Subject: Use git pull (not merge).

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

(limited to 'make/git.mk')

diff --git a/make/git.mk b/make/git.mk
index 0059448..072617e 100644
--- a/make/git.mk
+++ b/make/git.mk
@@ -13,8 +13,8 @@ noncurrentbranches = $(filter-out $(currentbranch),$(branches))
 update:
 	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)")
+	git pull "$(origin)"
+	$(if $(noncurrentbranches),$(foreach branch,$(noncurrentbranches),git branch -f "$(branch)" "$(origin)/$(branch)" && git checkout "$(branch)" && git pull "$(origin)" &&) git checkout "$(master)")
 
 init:
 	git init
-- 
cgit v1.2.3

e='submit' value='switch'/></form></td></tr>
<tr><td class='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/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian?h=master'>log</a><a href='/notmuch/tree/tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian?h=master'>tree</a><a href='/notmuch/commit/tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian?h=master'>commit</a><a class='active' href='/notmuch/diff/tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian?h=master'>diff</a></td><td class='form'><form class='right' method='get' action='/notmuch/log/tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian'>
<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/diff/?h=master'>root</a>/<a href='/notmuch/diff/tags?h=master'>tags</a>/<a href='/notmuch/diff/tags/80?h=master'>80</a>/<a href='/notmuch/diff/tags/80/8b?h=master'>8b</a>/<a href='/notmuch/diff/tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins?h=master'>440784966.233.1500673612086.JavaMail.jenkins@jenkins</a>/<a href='/notmuch/diff/tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian?h=master'>debian</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><div class='diffstat-header'><a href='/notmuch/diff/?h=master'>Diffstat</a> (limited to 'tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian?h=master'>tags/80/8b/440784966.233.1500673612086.JavaMail.jenkins@jenkins/debian</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td>