mrconfig | 11 +++++++---- mrconfig.README | 10 +--------- mrconfig.head | 4 ---- 3 files changed, 8 insertions(+), 17 deletions(-)
New commits: commit e4d36e640291b1d96b79697d2d564843417f42e2 Author: Cyril Brulebois <[email protected]> Date: Mon Jun 27 03:35:26 2011 +0200 Drop git2ssh completely. pushInsteadOf FTW. diff --git a/mrconfig b/mrconfig index eb70d87..487d9ba 100644 --- a/mrconfig +++ b/mrconfig @@ -12,10 +12,6 @@ checkout = update = git fetch "$@" -# Make it easy to switch from git:// to ssh:// so that one can push: -git2ssh = - sed -i 's,git://git.debian.org,ssh://git.debian.org,' $MR_REPO/.git/config - # Make it easy to run this command on all repositories: remoteaddupstream = xsf-remote-add-upstream diff --git a/mrconfig.head b/mrconfig.head index 792579b..e3df6e2 100644 --- a/mrconfig.head +++ b/mrconfig.head @@ -12,10 +12,6 @@ checkout = update = git fetch "$@" -# Make it easy to switch from git:// to ssh:// so that one can push: -git2ssh = - sed -i 's,git://@@host@@,ssh://@@host@@,' $MR_REPO/.git/config - # Make it easy to run this command on all repositories: remoteaddupstream = xsf-remote-add-upstream commit 529389ae67ae3cd45f2ce225c69f0db36d2d4378 Author: Cyril Brulebois <[email protected]> Date: Mon Jun 27 03:34:50 2011 +0200 Stop mentioning git2ssh. diff --git a/mrconfig.README b/mrconfig.README index 48e8c8e..f65f554 100644 --- a/mrconfig.README +++ b/mrconfig.README @@ -45,15 +45,7 @@ directory to update all repositories the former contains. ## But I want to commit! By default all repositories are cloned anonymously through the git protocol. -To be able to push, you can just perform an `s,git://,ssh://`, substitution in -the appropriate `.git/config` file. An alias is available in our mrconfig file: - - mr git2ssh - -It should only fail on the top-level directory (in our case: `~/debian-x`) for -which the alias is not defined (in `~/.mrconfig`), but since that should only -be one-shot, that's probably not a big deal. - +See the `pushInsteadOf` trick on <http://pkg-xorg.alioth.debian.org/reference/git-usage.html>. ## I want to update that file! commit 912623f69e653b7fb970d413ba0f28fd5b84ec4e Author: Cyril Brulebois <[email protected]> Date: Mon Jun 27 03:17:43 2011 +0200 Update repository list. Add lib/xcb-util* as well as wayland/wayland*. diff --git a/mrconfig b/mrconfig index 93ba776..eb70d87 100644 --- a/mrconfig +++ b/mrconfig @@ -213,6 +213,11 @@ remoteaddupstream = [lib/libxxf86vm.git] [lib/mesa.git] [lib/pixman.git] +[lib/xcb-util.git] +[lib/xcb-util-image.git] +[lib/xcb-util-keysyms.git] +[lib/xcb-util-renderutil.git] +[lib/xcb-util-wm.git] [lib/xft.git] [lib/xtrans.git] #[pkg-xorg.git] @@ -242,6 +247,8 @@ remoteaddupstream = [proto/x11proto-xf86misc.git] [proto/x11proto-xf86vidmode.git] [proto/x11proto-xinerama.git] +[wayland/wayland-demos.git] +[wayland/wayland.git] [xserver/xorg-server.git] [xserver/xprint.git] [xsfbs.git] -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
