Changes between Version 4 and Version 5 of GitInfo


Ignore:
Timestamp:
01/31/12 09:34:17 (12 years ago)
Author:
admin
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • GitInfo

    v4 v5  
    33== samle client session ==
    44
     5get git repository from private repository gittest from server, add a file
    56{{{
    6  git clone https://admin@svn.version.fz-juelich.de/gittest
     7>git clone https://admin@svn.version.fz-juelich.de/gittest
    78Initialized empty Git repository in /home/anke/test/gittest/.git/
    89remote: Counting objects: 6, done.
     
    1112Unpacking objects: 100% (6/6), done.
    1213
     14>echo "test" > test.txt
     15>git commit -m "testfile added"
     16>git push https://admin@svn.version.fz-juelich.de/gittest master
     17}}}
    1318
    14 git push https://admin@svn.version.fz-juelich.de/gittestloc master
     19push to global repository gittestBlessed
     20{{{
     21git push https://admin@svn.version.fz-juelich.de/gittestBlessed master
    1522Counting objects: 6, done.
    1623Delta compression using up to 2 threads.
     
    1825Writing objects: 100% (6/6), 451 bytes, done.
    1926Total 6 (delta 0), reused 0 (delta 0)
    20 To https://admin@svn.version.fz-juelich.de/gittestloc
     27To https://admin@svn.version.fz-juelich.de/gittestBlessed
    2128 * [new branch]      master -> master
    2229
    23 changed gittestloc
     30changed gittestBlessed
    2431changed gittest
    2532
     
    3542 1 files changed, 1 insertions(+), 0 deletions(-)
    3643
    37 git push https://admin@svn.version.fz-juelich.de/gittestloc master
    38 To https://admin@svn.version.fz-juelich.de/gittestloc
     44git push https://admin@svn.version.fz-juelich.de/gittestBlessed master
     45To https://admin@svn.version.fz-juelich.de/gittestBlessed
    3946 ! [rejected]        master -> master (non-fast-forward)
    40 error: failed to push some refs to 'https://admin@svn.version.fz-juelich.de/gittestloc'
     47error: failed to push some refs to 'https://admin@svn.version.fz-juelich.de/gittestBlessed'
    4148To prevent you from losing history, non-fast-forward updates were rejected
    4249Merge the remote changes before pushing again.  See the 'Note about
     
    4451
    4552>git commit -a -m"merged"
    46 [master 62de45b] Merge branch 'master' of https://svn.version.fz-juelich.de/gittestloc
     53[master 62de45b] Merge branch 'master' of https://svn.version.fz-juelich.de/gittestBlessed
    4754
    4855}}}