summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-01-28 23:31:32 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-01-28 23:31:32 -0200
commit444114c414b2e9a7a963901baa59e4638352f102 (patch)
tree226c05c78bc33d68ca1add7e20e24e8a13fc4a48
parentc14437add81c842176f66662e1156a2fc81a9458 (diff)
downloadmediapointer-dvb-s2-444114c414b2e9a7a963901baa59e4638352f102.tar.gz
mediapointer-dvb-s2-444114c414b2e9a7a963901baa59e4638352f102.tar.bz2
make pull will now do push -u
From: Mauro Carvalho Chehab <mchehab@infradead.org> pull -u allows retriving info from master database and also update local files. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Makefile2
-rw-r--r--v4l/ChangeLog7
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 94799bcab..dac78fc94 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ commit cvscommit hgcommit::
grep -v ^# /tmp/v4l_hg_commit.msg | hg commit -l -
pull update v4l-update::
- -hg pull $(REPO_PULL)
+ -hg pull -u $(REPO_PULL)
hg checkout
push::
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 582367c9d..8b3c7dc56 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-29 01:07 mchehab
+
+ * Makefile:
+ - make pull will now do push -u
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
2006-01-28 17:59 mchehab
* Makefile: