All pastes #595547 Raw Edit

Untitled

public text v1 · immutable
#595547 ·published 2007-06-29 15:39 UTC
rendered paste body
daba@rechenknecht:~/temp/compiz/compcomm/snow$ git push
updating 'refs/heads/master'
  from e6840a2d7bd5ad51567b013267291f16459cad04
  to   403d1fe5e3703078343b1b1cc534983bd5958e6e
Generating pack...
Done counting 5 objects.
Result has 3 objects.
Deltifying 3 objects...
 100% (3/3) done
Writing 3 objects...
 100% (3/3) done
Total 3 (delta 2), reused 0 (delta 0)
Unpacking 3 objects
refs/heads/master: e6840a2d7bd5ad51567b013267291f16459cad04 -> 403d1fe5e3703078343b1b1cc534983bd5958e6e
Unpacking 3 objects
* refs/remotes/origin/master: fast forward to branch 'master' of /home/git/fusion/plugins/snow
  old..new: e6840a2..403d1fe
Updating e6840a2..403d1fe
Fast forward
 snow.xml.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Unpacking 10 objects
* refs/remotes/origin/master: fast forward to branch 'master' of /git/compcomm/plugins-unsupported
  old..new: 51d03c9..cf21d26
Updating 6981407..cf21d26
Fast forward
 Makefile.am           |    2 +-
 configure.ac          |   13 ++--
 data/snow/snow.xml.in |  122 ----------------------------------------
 metadata/Makefile.am  |   28 +++++++--
 metadata/tile.xml     |  149 -------------------------------------------------
 po/POTFILES.in        |    2 +
 6 files changed, 31 insertions(+), 285 deletions(-)
 delete mode 100644 data/snow/snow.xml.in
 delete mode 100644 metadata/tile.xml
 create mode 100644 po/POTFILES.in
Created commit 4d5b6cb: Dummy commit.
 1 files changed, 1 insertions(+), 0 deletions(-)
Switched to branch "master"
updating 'refs/heads/master'
  from cf21d268aab44a4e57aa53b6f15c703c6046b838
  to   4d5b6cbcb1870c221dbdfd92f7db9192014bd2ea
Generating pack...
Done counting 7 objects.
Result has 4 objects.
Deltifying 4 objects.
 100% (4/4) done
Writing 4 objects.
 100% (4/4) done
Total 4 (delta 3), reused 0 (delta 0)
Unpacking 4 objects
refs/heads/master: cf21d268aab44a4e57aa53b6f15c703c6046b838 -> 4d5b6cbcb1870c221dbdfd92f7db9192014bd2ea
Clone or pull plugin
Clone or pull merged repo
Processing commit 403d1fe5e3703078343b1b1cc534983bd5958e6e
Checkouting right commit
Looking for removed files
Processing files
snow.c  >  src/snow/snow.c
snow.xml.in  >  metadata/snow.xml.in
Commiting
Pushing
Merging done
Already up-to-date.
destination directory 'unsupported' already exists.
fatal: Not a git repository: '.git'
fatal: Not a git repository: '.git'
Switched to branch "master"
fatal: Not a git repository: '.git'
Clone or pull plugin
Clone or pull i18n repo
Processing commit 403d1fe5e3703078343b1b1cc534983bd5958e6e
Checkouting right commit
Processing files
snow.xml.in  >  metadata/snow.xml.in
Commiting
Pushing
Merging done
daba@rechenknecht:~/temp/compiz/compcomm/snow$