From 8b944f3ea0aea70d4dd30a7fa3e7114d9f23f098 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 3 Oct 2010 10:56:24 +0200
Subject: [PATCH] Add make up and make update (update the working copy).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 21b1134..1fa6d71 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,10 @@ q:
 %: %.in Makefile ChangeLog
 	sed -e 's,@VERSION@,$(VERSION),g' $< > $@
 
+up: update
+update:
+	@git fetch && git rebase `git symbolic-ref HEAD | sed -e 's~refs/heads/~origin/~'` && git submodule update
+
 ################################################################################
 # targets
 
@@ -243,3 +247,4 @@ restart-listrpc: stop-listrpc start-listrpc
 .PHONY: wiki build-wiki
 .PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css
 .PHONY: start-listrpc start-listrpc-fg stop-listrpc restart-listrpc
+.PHONY: up update
-- 
2.1.4