Changes between Version 4 and Version 5 of GitInfo
- Timestamp:
- 01/31/12 09:34:17 (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
GitInfo
v4 v5 3 3 == samle client session == 4 4 5 get git repository from private repository gittest from server, add a file 5 6 {{{ 6 7 >git clone https://admin@svn.version.fz-juelich.de/gittest 7 8 Initialized empty Git repository in /home/anke/test/gittest/.git/ 8 9 remote: Counting objects: 6, done. … … 11 12 Unpacking objects: 100% (6/6), done. 12 13 14 >echo "test" > test.txt 15 >git commit -m "testfile added" 16 >git push https://admin@svn.version.fz-juelich.de/gittest master 17 }}} 13 18 14 git push https://admin@svn.version.fz-juelich.de/gittestloc master 19 push to global repository gittestBlessed 20 {{{ 21 git push https://admin@svn.version.fz-juelich.de/gittestBlessed master 15 22 Counting objects: 6, done. 16 23 Delta compression using up to 2 threads. … … 18 25 Writing objects: 100% (6/6), 451 bytes, done. 19 26 Total 6 (delta 0), reused 0 (delta 0) 20 To https://admin@svn.version.fz-juelich.de/gittest loc27 To https://admin@svn.version.fz-juelich.de/gittestBlessed 21 28 * [new branch] master -> master 22 29 23 changed gittest loc30 changed gittestBlessed 24 31 changed gittest 25 32 … … 35 42 1 files changed, 1 insertions(+), 0 deletions(-) 36 43 37 git push https://admin@svn.version.fz-juelich.de/gittest locmaster38 To https://admin@svn.version.fz-juelich.de/gittest loc44 git push https://admin@svn.version.fz-juelich.de/gittestBlessed master 45 To https://admin@svn.version.fz-juelich.de/gittestBlessed 39 46 ! [rejected] master -> master (non-fast-forward) 40 error: failed to push some refs to 'https://admin@svn.version.fz-juelich.de/gittest loc'47 error: failed to push some refs to 'https://admin@svn.version.fz-juelich.de/gittestBlessed' 41 48 To prevent you from losing history, non-fast-forward updates were rejected 42 49 Merge the remote changes before pushing again. See the 'Note about … … 44 51 45 52 >git commit -a -m"merged" 46 [master 62de45b] Merge branch 'master' of https://svn.version.fz-juelich.de/gittest loc53 [master 62de45b] Merge branch 'master' of https://svn.version.fz-juelich.de/gittestBlessed 47 54 48 55 }}}