1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 |
dennis@dennb:~/Desktop/fallstudie$ echo "text"> FILE dennis@dennb:~/Desktop/fallstudie$ git add FILE dennis@dennb:~/Desktop/fallstudie$ git commit -m "A new File" [master 5283d24] A new File 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 FILE dennis@dennb:~/Desktop/fallstudie$ git push Counting objects: 4, done. Delta compression using up to 2 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 303 bytes, done. Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/dennis/git/fallstudie bb71fd5..5283d24 master -> master
dennis@dennb:~/Desktop/fallstudie$ cd ../test/ dennis@dennb:~/Desktop/test$ git fetch remote: Counting objects: 4, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From /home/dennis/git/fallstudie bb71fd5..5283d24 master -> origin/master dennis@dennb:~/Desktop/test$ git rebase origin First, rewinding head to replay your work on top of it... Fast-forwarded master to origin. dennis@dennb:~/Desktop/test$ echo "a new text" > FILE dennis@dennb:~/Desktop/test$ git add FILE dennis@dennb:~/Desktop/test$ git commit -m "A new text" [master 2db9193] A new text 1 files changed, 1 insertions(+), 1 deletions(-) dennis@dennb:~/Desktop/test$ git push Counting objects: 5, done. Delta compression using up to 2 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 301 bytes, done. Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/dennis/git/fallstudie 5283d24..2db9193 master -> master
dennis@dennb:~/Desktop/test$ cd ../fallstudie/ dennis@dennb:~/Desktop/fallstudie$ git fetch remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From /home/dennis/git/fallstudie 5283d24..2db9193 master -> origin/master dennis@dennb:~/Desktop/fallstudie$ git rebase origin fatal: Needed a single revision invalid upstream origin dennis@dennb:~/Desktop/fallstudie$ git rebase origin/master First, rewinding head to replay your work on top of it... Fast-forwarded master to origin/master. dennis@dennb:~/Desktop/fallstudie$
|