Git

722 views

Published on

0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
722
On SlideShare
0
From Embeds
0
Number of Embeds
2
Actions
Shares
0
Downloads
4
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Git

  1. 1. Git Git
  2. 2. • clone pull • branch • • (git add) • branch
  3. 3. ( ) • git clone <shared repository URL> • git pull • git checkout -b <new branch name> • git add <path to be added> • git commit -m ’comment’
  4. 4. • ( ) • ( )
  5. 5. • pull • master merge (–no-ff ) – conflict – 3-way merge ? • push
  6. 6. • git checkout master • git pull • git merge --no-ff <branch name> • git push
  7. 7. • format-patch master • • git am ( ) :
  8. 8. ( ) • branch • git am • master merge
  9. 9. ( ) • git am -3 3-way merge

×