|
| 1 | +<<<<<<< HEAD |
| 2 | +# Important GIT commands |
| 3 | + |
| 4 | + git status // gives you all the status |
| 5 | + git history // shows the history of git commands |
| 6 | + git add . |
| 7 | + git alias |
| 8 | + git c working |
| 9 | + git push origin working:demo // I want to move this to some other branch and rename it |
| 10 | + git c feature |
| 11 | + git lga |
| 12 | + git mergetool // brings up the git merge tool |
| 13 | + git rebase --continue (rebase continue) |
| 14 | + git commit --amend |
| 15 | + git rebase --continue |
| 16 | + git checkout feature |
| 17 | + git push origin working:demo / add a new branch to git |
| 18 | + git push origin :demo // delete a remote branch - This is how you delete from your source of truth |
| 19 | + git clone ./lab2/.git lab2-clone // clone a branch |
| 20 | + git push origin working:demo // new |
| 21 | + git rebase working |
| 22 | + get lga |
| 23 | + git rebase feature |
| 24 | + git mergetool |
| 25 | + git rebase --continue |
| 26 | + git mergetool |
| 27 | + same as above |
| 28 | + git branch -D working |
| 29 | + git push -u origin master |
| 30 | + git push -u origin working |
| 31 | + git push -u origin feature |
| 32 | + mkdir deleteme |
| 33 | + cd deleteme |
| 34 | + git init |
| 35 | + touch file1.txt |
| 36 | + touch file2.txt |
| 37 | + touch file3.txt |
| 38 | + git status |
| 39 | + git add . |
| 40 | + git status |
| 41 | + git config --global user.email " [email protected]" |
| 42 | + git config --global user.name "Syed Akhtar" |
| 43 | + git commit -m "first commit" |
| 44 | + git checkout -b working - now the branch says working not master |
| 45 | + rm * |
| 46 | + git status |
| 47 | + git add . // this did not do anything because there are no files |
| 48 | + git add -A . // I am committing that those files are actually deleted - you are committing the deletions |
| 49 | + git commit -m "deleted files" committing the deleted files |
| 50 | + git checkout master // to go into master git directory |
| 51 | + git checkout working // to go into working git directory |
| 52 | + git log working |
| 53 | + git log master |
| 54 | + . setup.sh |
| 55 | + atom . |
| 56 | + git c working |
| 57 | + git merge feature |
| 58 | + git reset HEAD~1 |
| 59 | + git status |
| 60 | + git lga |
| 61 | + git reflog |
| 62 | + git reset HEAD~1 |
| 63 | + git reset --hard HEAD~1 |
| 64 | + |
| 65 | + ## GIT Information and Administration |
| 66 | + |
| 67 | + https://github.com/ |
| 68 | + userid: sakhtar01 |
| 69 | + password: Uzma0101 |
| 70 | + |
| 71 | + https://github.com/improvingenterprises/GITLabs-CATechnologie |
| 72 | + Installing GIT - http://git-scm.com - http://git-scm.com/download/win |
| 73 | + |
| 74 | + Go to https://atom.io/ and download Atom - click on download windows installer |
| 75 | +======= |
| 76 | +# Git Notes |
| 77 | +This is the Git notes from the 2-day training session at ImprovingEnterprises on Jan 21-22, 2015. |
| 78 | +## Git Overview |
| 79 | + |
| 80 | +## Command Line Cheat Sheet |
| 81 | +Verify Git installation |
| 82 | +``` |
| 83 | +git --version |
| 84 | +``` |
| 85 | +Get help with Git |
| 86 | +``` |
| 87 | +git help |
| 88 | +``` |
| 89 | +### Working Locally |
| 90 | +Start git at a folder |
| 91 | +``` |
| 92 | +git init |
| 93 | +``` |
| 94 | + |
| 95 | +### Working with Remote Repos |
| 96 | + |
| 97 | +## Discussions |
| 98 | +>>>>>>> 3c077245a4292b628e37d3ecc9462cab960347c1 |
0 commit comments