Git के साथ दैनिक कार्य

• क्या मुझे उस विकास प्रक्रिया के लिए "ट्यून" किया जा सकता है जिसकी मुझे आवश्यकता है?
• क्या प्रबंधक और ग्राहक इस प्रक्रिया से संतुष्ट होंगे?
• क्या डेवलपर्स के लिए काम करना आसान होगा?
• क्या शुरुआती प्रक्रिया में जल्दी शामिल हो सकते हैं?
• क्या प्रक्रिया को बदलना आसान और तेज है?

एक योजना के बजाय

• पर्यावरण
• प्रयोग करने से डरना बंद करो
• बिल्डिंग रिपोजिटरी
• जीआईटी स्टार्ट
• हम परियोजना में शामिल हैं
• विशिष्ट परियोजना परिदृश्य

पर्यावरण

1. Git
2. कंसोल
3. मॉनिटर के दूसरी तरफ का आदमी जो जानता है कि यह सब उसकी पसंदीदा धुरी के नीचे कैसे रखा जाए

 usage: git [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path] [-p|--paginate|--no-pager] [--no-replace-objects] [--bare] [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>] [-c name=value] [--help] <command> [<args>] The most commonly used git commands are: add Add file contents to the index bisect Find by binary search the change that introduced a bug branch List, create, or delete branches checkout Checkout a branch or paths to the working tree clone Clone a repository into a new directory commit Record changes to the repository diff Show changes between commits, commit and working tree, etc fetch Download objects and refs from another repository grep Print lines matching a pattern init Create an empty git repository or reinitialize an existing one log Show commit logs merge Join two or more development histories together mv Move or rename a file, a directory, or a symlink pull Fetch from and merge with another repository or a local branch push Update remote refs along with associated objects rebase Forward-port local commits to the updated upstream head reset Reset current HEAD to the specified state rm Remove files from the working tree and from the index show Show various types of objects status Show the working tree status tag Create, list, delete or verify a tag object signed with GPG See 'git help <command>' for more information on a specific command. 

प्रयोग करने से डरना बंद करें

आप कुछ भी कर सकते हैं, किसी भी कमांड को निष्पादित कर सकते हैं, प्रयोग सेट कर सकते हैं, हटा सकते हैं, बदल सकते हैं। मुख्य बात git push करना नहीं है।
केवल यह आदेश परिवर्तनों को दूसरे रिपॉजिटरी में स्थानांतरित करता है। केवल इस तरह से कुछ टूट सकता है।

बिल्डिंग रिपोजिटरी

1. फ़ाइल - हमारे पास रिपॉजिटरी फ़ाइलों तक सीधी पहुंच है।
2. SSH - हमारे पास ssh के माध्यम से सर्वर पर फाइलों तक पहुंच है।
3. HTTP (S) - http को सेंड / रिसीव के रूप में उपयोग करें।

 git clone git@github.com:user/repo.git 

 git clone ssh://git@github.com:user/repo.git 

 ssh -vvv git@github.com 

 git clone --help 

1. हम आपके अपने दूरस्थ भंडार का आविष्कार करेंगे
2. डेवलपर्स (dev1 और dev2) की ओर से इसके दो क्लोन बनाते हैं

 $ mkdir git-habr # ,    $ cd git-habr $ git init --bare origin Initialized empty Git repository in /home/sirex/proj/git-habr/origin/ 

 $ git clone --no-hardlinks origin dev1 Cloning into 'dev1'... warning: You appear to have cloned an empty repository. done. $ git clone --no-hardlinks origin dev2 Cloning into 'dev2'... warning: You appear to have cloned an empty repository. done. 

जीआईटी स्टार्ट

स्कैंडल्स! साज़िश! जांच!

• Git फोल्डर को स्टोर नहीं करता है
• Git फ़ाइलों को संग्रहीत नहीं करता है
• रिवीजन में सीरियल नंबर नहीं है
• संस्करण (संपादन, कमिट) क्रम से बाहर जा सकते हैं
• Git * में कोई शाखाएं नहीं हैं (एक छोटे से कैविएट के साथ)

यह सब कैसे काम करता है?
यह सब कैसे समझा और याद किया जा सकता है?

Git। लगभग हुड के नीचे

 $ git init /tmp/test Initialized empty Git repository in /tmp/test/.git/ $ cd /tmp/test $ cp ~/debian.iso . # iso  168  $ du -sh .git #   .git 92K .git $ git add debian.iso $ git commit -m "Added iso" [master (root-commit) 0fcc821] added iso 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 debian.iso $ du -sh .git #  163M .git # .      (   ) $ cp debian.iso debian2.iso $ cp debian.iso debian3.iso $ git add debian2.iso debian3.iso $ git commit -m "Copied iso" [master f700ab5] copied iso 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 debian2.iso create mode 100644 debian3.iso $ du -sh .git #  163M .git #   .     ,     . 

 git checkout <commit> 

वैसे, मैं यहां ध्यान देना चाहता हूं कि फ़ाइल / फ़ोल्डर पर परियोजना के एक भाग पर एक टैग बनाना असंभव है, आदि। हालत पूरी तरह से बहाल है। इसलिए, परियोजनाओं को एक अलग भंडार में रखने की सिफारिश की जाती है, और प्रोजेक्ट 1, प्रोजेक्ट 2 आदि को नहीं जोड़ा जाता है। बस जड़ तक।

Git * में कोई शाखाएं नहीं हैं (एक छोटे से कैविएट के साथ)

शब्दावली

सरल संपादन

1. गिट की स्थिति
2. gitk

 dev1$ vim README.md dev1$ git add README.md dev1$ git commit -m "Init Project" [master (root-commit) e30cde5] Init Project 1 file changed, 4 insertions(+) create mode 100644 README.md dev1$ git status # On branch master nothing to commit (working directory clean) 

 dev1$ git push origin No refs in common and none specified; doing nothing. Perhaps you should specify a branch such as 'master'. fatal: The remote end hung up unexpectedly error: failed to push some refs to '/home/sirex/proj/git-habr/origin' dev1$ git push origin master Counting objects: 3, done. Writing objects: 100% (3/3), 239 bytes, done. Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] master -> master 

 dev2$ git pull remote: Counting objects: 3, done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From /home/sirex/proj/git-habr/origin * [new branch] master -> origin/master 

 dev1(master)$ vim README.md dev1(master)$ git commit -m "Change 1" -a dev1(master)$ vim README.md dev1(master)$ git commit -m "Change 2" -a dev1(master)$ vim README.md dev1(master)$ git commit -m "Change 3" -a 

छिपा हुआ पाठ

पहली प्रतिबद्धताओं पर प्रकाश डाला। क्रम में चलते हुए, नीचे से ऊपर तक, हम देख सकते हैं कि रिपॉजिटरी कैसे बदल गई:

 @@ -2,3 +2,4 @@ My New Project -------------- Let's start +Some changes 

 @@ -3,3 +3,5 @@ My New Project Let's start Some changes +Some change 2 + 

 @@ -2,6 +2,5 @@ My New Project -------------- Let's start -Some changes -Some change 2 +Some change 3 

 dev1(master)$ git branch <branch_name> <commit_id> #    git branch <branch_name> HEAD~1 #     dev1(master)$ git checkout <branch_name> 

 dev1(v2)$ vim README.md dev1(v2)$ git commit -m "Ugly changes" -a [v2 75607a1] Ugly changes 1 file changed, 1 insertion(+), 1 deletion(-) 

तेजी से उल्टा

 dev1(v2)$ git checkout master Switched to branch 'master' Your branch is ahead of 'origin/master' by 3 commits. # ,      master   origin 

 #!/bin/sh USER=collider case $1 in *) echo Uknown Action: $1 ;; esac 

 dev1(master)$ git add collider.init.sh dev1(master)$ git commit -m "Added collider init script" [master 0c3aa28] Added collider init script 1 file changed, 11 insertions(+) create mode 100755 collider.init.sh dev1(master)$ git checkout -b collider/start #   Switched to a new branch 'collider/start' dev1(collider/start)$ git checkout -b collider/terminate #   Switched to a new branch 'collider/terminate' 

 @@ -0,0 +1,11 @@ +#!/bin/sh + + +USER=collider + + +case $1 in + *) + echo Uknown Action: $1 + ;; +esac 

 dev1(collider/start)$ vim collider.init.sh dev1(collider/start)$ git commit -m "Added Collider Start Function" -a [collider/start d229fa9] Added Collider Start Function 1 file changed, 9 insertions(+) dev1(collider/start)$ git checkout collider/terminate Switched to branch 'collider/terminate' dev1(collider/terminate)$ vim collider.init.sh dev1(collider/terminate)$ git commit -m "Added Collider Terminate Function" -a [collider/terminate 4ea02f5] Added Collider Terminate Function 1 file changed, 9 insertions(+) 

 @@ -3,8 +3,17 @@ USER=collider +do_start(){ + echo -n "Starting collider..." + sleep 1s + echo "ok" + echo "The answer is 42. Please, come back again after 1 billion years." +} case $1 in + start) + do_start + ;; *) echo Uknown Action: $1 ;; 

 @@ -3,8 +3,17 @@ USER=collider +do_terminate() { + echo -n "Safely terminating collider..." + sleep 1s + echo "oops :(" + +} case $1 in + terminate) + do_terminate + ;; *) echo Uknown Action: $1 ;; 

1. विलय करते समय, कुछ भी करने की आवश्यकता नहीं है
2. स्वचालित एसोसिएशन, इसके अलावा, गारंटी
3. संघर्ष संभव नहीं है और कभी भी उत्पन्न नहीं होगा
4. कहानी रैखिक बनी हुई है (जैसे कि कोई संगति नहीं थी), जिसे अक्सर बड़ी परियोजनाओं पर समझना आसान होता है
5. कोई नया कमिट नहीं दिखाई देता

 dev1(collider/terminate)$ git checkout master Switched to branch 'master' Your branch is ahead of 'origin/master' by 4 commits. dev1(master)$ git merge collider/start Updating 0c3aa28..d229fa9 Fast-forward #    collider.init.sh | 9 +++++++++ 1 file changed, 9 insertions(+) 

संघ

 dev1(master)$ git merge --ff-only collider/terminate fatal: Not possible to fast-forward, aborting. 

 dev1(master)$ git merge collider/terminate Auto-merging collider.init.sh CONFLICT (content): Merge conflict in collider.init.sh Automatic merge failed; fix conflicts and then commit the result. 

जब दो या दो से अधिक कॉम्बिनेशन को मिलाने की कोशिश की जाती है, तो एक ही लाइन में बदलाव किए जाते हैं। और अब गिट को पता नहीं है कि क्या करना है: या तो पहला विकल्प लें, या दूसरा, या पुराने को छोड़ दें, या सब कुछ हटा दें।

 dev1(master)$ git status # On branch master # Your branch is ahead of 'origin/master' by 5 commits. # # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: collider.init.sh # no changes added to commit (use "git add" and/or "git commit -a") dev1(master)$ gitk --all 

 #!/bin/sh USER=collider <<<<<<< HEAD do_start(){ echo -n "Starting collider..." sleep 1s echo "ok" echo "The answer is 42. Please, come back again after 1 billion years." } case $1 in start) do_start ======= do_terminate() { echo -n "Safely terminating collider..." sleep 1s echo "oops :(" } case $1 in terminate) do_terminate >>>>>>> collider/terminate ;; *) echo Uknown Action: $1 ;; esac 

1. भिन्न या मर्ज कार्यक्रमों की पसंद का उपयोग करने के लिए ढूँढता है और प्रदान करता है
2. फ़ाइल फ़ाइल नाम बनाता है ।orig (फ़ाइल को मर्ज करने का प्रयास करने से पहले)
3. फ़ाइल का नाम फ़ाइल नाम बनाता है। फ़ाइल (जो फ़ाइल थी)
4. फ़ाइल का नाम फ़ाइल नाम बनाता है। (जैसा कि इसे किसी अन्य शाखा में बदला गया था)
5. फ़ाइल का नाम फ़ाइल बनाता है। Local (जैसा कि हमने इसे बदल दिया है)
6. संघर्षों को हल करने के बाद, सब कुछ फ़ाइल नाम में सहेजा जाता है

 dev1(master)$ git mergetool merge tool candidates: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse ecmerge p4merge araxis bc3 emerge vimdiff Merging: collider.init.sh Normal merge conflict for 'collider.init.sh': {local}: modified file {remote}: modified file Hit return to start merge resolution tool (kdiff3): 

पुनर्गठन

 dev1(master)$ git reset --hard collider/start HEAD is now at d229fa9 Added Collider Start Function 

 d229fa9 HEAD@{0}: reset: moving to collider/start 80b77c3 HEAD@{1}: commit (merge): Merged collider/terminate d229fa9 HEAD@{2}: merge collider/start: Fast-forward 0c3aa28 HEAD@{3}: checkout: moving from collider/terminate to master 4ea02f5 HEAD@{4}: commit: Added Collider Terminate Function 0c3aa28 HEAD@{5}: checkout: moving from collider/start to collider/terminate d229fa9 HEAD@{6}: commit: Added Collider Start Function 0c3aa28 HEAD@{7}: checkout: moving from collider/launch to collider/start 0c3aa28 HEAD@{8}: checkout: moving from collider/terminate to collider/launch 0c3aa28 HEAD@{9}: checkout: moving from collider/stop to collider/terminate 0c3aa28 HEAD@{10}: checkout: moving from collider/start to collider/stop 0c3aa28 HEAD@{11}: checkout: moving from master to collider/start 0c3aa28 HEAD@{12}: commit: Added collider init script 41f0540 HEAD@{13}: checkout: moving from v2 to master 75607a1 HEAD@{14}: commit: Ugly changes 55280dc HEAD@{15}: checkout: moving from master to v2 41f0540 HEAD@{16}: commit: Change 3 55280dc HEAD@{17}: commit: Change 2 598a03a HEAD@{18}: commit: Change 1 d80e5f1 HEAD@{19}: commit (initial): Init Project 

: merge-commit. collider/terminate collider/start .
collider/terminate collider/start , master merge-commit . , , master ( git checkout master && git reset --hard collider/terminate ). , . Git — , .

 dev1(master)$ git checkout collider/terminate Switched to branch 'collider/terminate' dev1(collider/terminate)$ git rebase -i master # -i    , ..  git rebase todo list       

 pick 4ea02f5 Added Collider Terminate Function # Rebase d229fa9..4ea02f5 onto d229fa9 # # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run command (the rest of the line) using shell # # These lines can be re-ordered; they are executed from top to bottom. # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. # 

 error: could not apply 4ea02f5... Added Collider Terminate Function When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort". Could not apply 4ea02f5... Added Collider Terminate Function dev1((no branch))$ git status # Not currently on any branch. # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: collider.init.sh # no changes added to commit (use "git add" and/or "git commit -a") 

 dev1(collider/terminate)$ git checkout master Switched to branch 'master' Your branch is ahead of 'origin/master' by 5 commits. dev1(master)$ git merge collider/terminate Updating d229fa9..6661c2e Fast-forward collider.init.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) dev1(master)$ git branch -d collider/start Deleted branch collider/start (was d229fa9). dev1(master)$ git branch -d collider/terminate Deleted branch collider/terminate (was 6661c2e). 

एक विराम

• आसान रिपोजिटरी निर्माण
• क्लोनिंग रिपॉजिटरी
• परिवर्तन के साथ ही काम करता है
• एक परियोजना / पुस्तकालय / प्लगइन - एक भंडार
• शाखाएँ, टिप्पणियाँ, कमेंट आसानी से बदल दिए जाते हैं
• आप किसी भी राज्य का चयन कर सकते हैं और उससे एक नई कहानी शुरू कर सकते हैं।
• यदि परिवर्तन "एक सीधी रेखा पर झूठ बोलते हैं" तो आप तेजी से आगे कर सकते हैं (उल्टा, बिना संघर्ष के विलय)

 dev1(master)$ for i in `seq 1 2`; do STR=`pwgen -C 20 -B 1`; echo $STR >> trash.txt; git commit -m "Added $STR" trash.txt; done [master e64499d] Added rooreoyoivoobiangeix 1 file changed, 1 insertion(+) [master a3ae806] Added eisahtaexookaifadoow 1 file changed, 1 insertion(+) 

परिवर्तन भेजना और प्राप्त करना

• दूरस्थ रिपॉजिटरी के बारे में जानकारी जोड़ें / हटाएं / बदलें
• डेटा प्राप्त करें (शाखाएं, टैग, कमिट)
• अपना डेटा (शाखाएं, टैग, कमिट) भेजें

1. git remote - दूरस्थ रिपोजिटरी का प्रबंधन
2. git fetch - मिलता है
3. git pull- समान git fetch+git merge
4. git push - भेजें

दूरदराज के

 dev1(master)$ git remote show origin * remote origin Fetch URL: /home/sirex/proj/git-habr/origin Push URL: /home/sirex/proj/git-habr/origin HEAD branch: master Remote branch: master tracked Local branch configured for 'git pull': master merges with remote master Local ref configured for 'git push': master pushes to master (fast-forwardable) 

 git remote add backup_repo ssh://user@myserver:backups/myrepo.git #   git push backup_repo master 

git fetch

 dev1(master)$ git push origin master Counting objects: 29, done. Delta compression using up to 4 threads. Compressing objects: 100% (21/21), done. Writing objects: 100% (27/27), 2.44 KiB, done. Total 27 (delta 6), reused 0 (delta 0) Unpacking objects: 100% (27/27), done. To /home/sirex/proj/git-habr/origin d80e5f1..a3ae806 master -> master 

 dev2(master)$ git log commit d80e5f1746856a7228cc27072fa71f1c087d649a Author: jsirex Date: Thu Apr 4 04:21:07 2013 +0300 Init Project #   ,  : dev2(master)$ git fetch origin remote: Counting objects: 29, done. remote: Compressing objects: 100% (21/21), done. remote: Total 27 (delta 6), reused 0 (delta 0) Unpacking objects: 100% (27/27), done. From /home/sirex/proj/git-habr/origin d80e5f1..a3ae806 master -> origin/master 

 dev2(master)$ git merge origin/master Updating d80e5f1..a3ae806 Fast-forward README.md | 2 ++ collider.init.sh | 31 +++++++++++++++++++++++++++++++ trash.txt | 2 ++ 3 files changed, 35 insertions(+) create mode 100755 collider.init.sh create mode 100644 trash.txt 

पकड़ खींचो

1. यह देखता है कि क्या स्थानीय स्तर पर पहले से ही ऐसी कोई शाखा है और अगर वहाँ है, तो वह लेता है
2. यदि कोई शाखा नहीं है, तो लगता है कि यह दूरस्थ रूप से मूल / <शाखा_नाम> है
3. अगर वहाँ है, तो यह स्थानीय रूप से <ब्रांच / नाम> की उत्पत्ति / <ब्रांच_नाम> और "लिंक" के रूप में एक ही स्थान पर बनाता है। ये ब्रांच (ब्रांच <ब्रांच_नाम> अब रिमोट ओरिजिन / <ब्रांच_नाम> ट्रैक कर रहा है )

 [branch "master"] remote = origin merge = refs/heads/master 

 git config branch.<branch_name>.rebase true 

जोर का धक्का

• मैं कुछ परिवर्तनों को कैसे पास करूं?
• मैं एक शाखा कैसे हटाऊं?
• मैं एक विशिष्ट प्रतिबद्ध से एक नई शाखा कैसे बना सकता हूं?
• आदि

 git push origin d80e5f1:old_master #       old_master.     d80e5f1 git push origin my_local_feature:new_feature/with_nice_name #     new_feature/with_nice_name  my_local_feature git push origin :dead_feature #   ""  dead_feature. ..  dead_feature   .    

 git push origin master --force #    ,   

हम परियोजना में शामिल हैं

संस्करण नियंत्रण प्रणाली एक परियोजना पर सहयोग करने के लिए एक से अधिक डेवलपर की अनुमति देती है।

विशिष्ट परियोजना परिदृश्य

• रिलीज़ रिलीज़
• बग फिक्सिंग
• तत्काल सुधार (हॉटफ़िक्स)
• एक ही समय में कई सुविधाओं का विकास (विशेषताएं विकास)
• विशिष्ट सुविधाओं का मुद्दा या तत्परता पर जारी करना

• आप कई कार्यों पर काम कर सकते हैं। एक बग पर अटक गया, देव में बदल गया, एक नई शाखा बनाई और दूसरे को ठीक किया, फिर पहले पर वापस आ गया। ताज़ा किया, सब कुछ त्याग दिया और एक तिहाई करना शुरू किया।
• समस्या उत्पादन पर गंभीर हो गई - उन्होंने रिबास शाखा को मास्टर या एक विशिष्ट हॉटफ़िक्स पर फिक्स के साथ फिर से बनाया और एक नए संस्करण को केवल एक फिक्स के साथ जारी किया।
• उसी तरह, आप कार्य को अन्य शाखाओं में स्थानांतरित कर सकते हैं, उदाहरण के लिए, सुविधा- शाखाओं को
• परिवर्तन भेजने से पहले, आप शाखा को थोड़ा कंघी कर सकते हैं, वहां से अतिरिक्त कमिट्स निकाल सकते हैं, टिप्पणियों को सही कर सकते हैं, आदि

बग ठीक करना

 dev1(master)$ git status # On branch master nothing to commit (working directory clean) dev1(master)$ git checkout -b dev Switched to a new branch 'dev' dev1(dev)$ git push origin dev Total 0 (delta 0), reused 0 (delta 0) To /home/sirex/proj/git-habr/origin * [new branch] dev -> dev 

 dev2(master)$ git pull From /home/sirex/proj/git-habr/origin * [new branch] dev -> origin/dev Already up-to-date. 

 dev1(dev)$ for i in `seq 1 10`; do STR=`pwgen -C 20 -B 1`; echo $STR >> trash.txt; git commit -m "Added $STR" trash.txt; done [dev 0f019d0] Added ahvaisaigiegheweezee 1 file changed, 1 insertion(+) [dev c715f87] Added eizohshochohseesauge 1 file changed, 1 insertion(+) [dev 9b9672c] Added aitaquuerahshiqueeph 1 file changed, 1 insertion(+) [dev 43dad98] Added zaesooneighufooshiph 1 file changed, 1 insertion(+) [dev 9da2de3] Added aebaevohneejaefochoo 1 file changed, 1 insertion(+) [dev e93f93e] Added rohmohpheinugogaigoo 1 file changed, 1 insertion(+) [dev 54ba433] Added giehaokeequokeichaip 1 file changed, 1 insertion(+) [dev 05f72db] Added hacohphaiquoomohxahb 1 file changed, 1 insertion(+) [dev 8c03e0d] Added eejucihaewuosoonguek 1 file changed, 1 insertion(+) [dev cf21377] Added aecahjaokeiphieriequ 1 file changed, 1 insertion(+) 

 dev2(master)$ for i in `seq 1 6`; do STR=`pwgen -C 20 -B 1`; echo $STR >> trash.txt; git commit -m "Added $STR" trash.txt; done [master 1781a2f] Added mafitahshohfaijahney 1 file changed, 1 insertion(+) [master 7df3851] Added ucutepoquiquoophowah 1 file changed, 1 insertion(+) [master 75e7b2b] Added aomahcaashooneefoavo 1 file changed, 1 insertion(+) [master d4dea7e] Added iexaephiecaivezohwoo 1 file changed, 1 insertion(+) [master 1459fdb] Added quiegheemoighaethaex 1 file changed, 1 insertion(+) [master 1a949e9] Added evipheichaicheesahme 1 file changed, 1 insertion(+) 

 dev1(dev)$ git push origin dev Counting objects: 32, done. Delta compression using up to 4 threads. Compressing objects: 100% (30/30), done. Writing objects: 100% (30/30), 2.41 KiB, done. Total 30 (delta 19), reused 0 (delta 0) Unpacking objects: 100% (30/30), done. To /home/sirex/proj/git-habr/origin a3ae806..cf21377 dev -> dev 

 dev2(master)$ git push origin dev error: src refspec dev does not match any. error: failed to push some refs to '/home/sirex/proj/git-habr/origin' 

1. चूंकि कोई अन्य परिवर्तन नहीं थे, इसलिए देव पर स्विच करें
2. मास्टर से देव में सभी परिवर्तनों को मिलाएं , जहां उन्हें होना चाहिए था (सीधा रास्ता, तेजी से आगे , कोई समस्या नहीं)
3. हम सही देव को चलाएंगे और गलत गुरु को पुराने, सही स्थान पर सेट करेंगे, जहाँ यह हुआ करता था ( मूल / स्वामी पर )

 dev2(master)$ git checkout dev #  Branch dev set up to track remote branch dev from origin. Switched to a new branch 'dev' dev2(dev)$ git merge master #  fast-forward Updating a3ae806..1a949e9 Fast-forward trash.txt | 6 ++++++ 1 file changed, 6 insertions(+) dev2(dev)$ git checkout master #   master ... Switched to branch 'master' Your branch is ahead of 'origin/master' by 6 commits. dev2(master)$ git reset --hard origin/master # ...       HEAD is now at a3ae806 Added eisahtaexookaifadoow dev2(master)$ git checkout dev #   dev Switched to branch 'dev' Your branch is ahead of 'origin/dev' by 6 commits. 

 dev2(dev)$ git push origin dev To /home/sirex/proj/git-habr/origin ! [rejected] dev -> dev (non-fast-forward) error: failed to push some refs to '/home/sirex/proj/git-habr/origin' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (eg 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. 

 dev2(dev)$ git fetch origin remote: Counting objects: 32, done. remote: Compressing objects: 100% (30/30), done. remote: Total 30 (delta 19), reused 0 (delta 0) Unpacking objects: 100% (30/30), done. From /home/sirex/proj/git-habr/origin a3ae806..cf21377 dev -> origin/dev 

1. जो कुछ भी था उसे मिटाकर हमारे परिवर्तनों को जबरन हस्तांतरित करें: git push origin dev --force
2. शाखा का उपयोग करना जारी रखें git merge origin/devऔर फिर git push origin dev(अपने और स्थानांतरण के साथ नए परिवर्तन मर्ज करें)
3. हमारी शाखा को नए के शीर्ष पर फिर से बनाएँ, जो विकास क्रम को बनाए रखेगा और अनावश्यक शाखाओं से बचाएगा: git rebase origin/devऔर फिर git push origin dev।

 dev2(dev)$ git rebase -i origin/dev #      origin/dev 

 pick 1781a2f Added mafitahshohfaijahney pick 7df3851 Added ucutepoquiquoophowah pick 75e7b2b Added aomahcaashooneefoavo pick d4dea7e Added iexaephiecaivezohwoo pick 1459fdb Added quiegheemoighaethaex pick 1a949e9 Added evipheichaicheesahme # Rebase cf21377..1a949e9 onto cf21377 # # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run command (the rest of the line) using shell # # These lines can be re-ordered; they are executed from top to bottom. # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. # 

• प्रत्येक कमिट में एक से अधिक तार्किक परिवर्तन नहीं होने चाहिए। यदि आपने एक फीचर बनाया है और कोड में बग को देखा है, तो इसे अलग कमिट के साथ ठीक करना बेहतर है। बाद में, जब संयुक्त, संघर्षों को हल करना बहुत आसान होगा, जैसा कि आप संघर्ष के साथ एक अलग प्रतिबद्ध देखेंगे और इसका क्या अर्थ है। प्रोजेक्ट के बिल्डिंग ब्लॉक्स के रूप में सोचें। अपने आप में प्रत्येक ईंट तार्किक और पूर्ण है।
• काम को वितरित करने का प्रयास करें ताकि यह ओवरलैप न हो, अर्थात। समान फ़ाइलों को समान स्थानों में संपादित नहीं किया गया था। यदि एक वर्ग का तर्क एक साथ दो शाखाओं में बदलता है, तो इस प्रणाली का उपयोग करने के बाद कुछ प्रणालियों के संयोजन से काम करना बंद हो जाएगा। अन्यथा, सब कुछ काम करना बंद कर देगा।

 dev2(dev)$ git push origin dev Counting objects: 20, done. Delta compression using up to 4 threads. Compressing objects: 100% (18/18), done. Writing objects: 100% (18/18), 1.67 KiB, done. Total 18 (delta 11), reused 0 (delta 0) Unpacking objects: 100% (18/18), done. To /home/sirex/proj/git-habr/origin cf21377..8212c4b dev -> dev 

1. देव शाखा में सुधार या अलग
2. उत्पत्ति से परिवर्तन ( git fetch origin)
3. नवीनतम संस्करण में परिवर्तन फिर से बनाएँ ( git rebase -i origin/dev)
4. उत्पत्ति में परिवर्तन ( git push origin dev)

सुविधा शाखा

चलो लघु-लाइव सुविधा शाखाओं के साथ शुरू करते हैं

 dev1(dev)$ git fetch origin remote: Counting objects: 20, done. remote: Compressing objects: 100% (18/18), done. remote: Total 18 (delta 11), reused 0 (delta 0) Unpacking objects: 100% (18/18), done. From /home/sirex/proj/git-habr/origin cf21377..8212c4b dev -> origin/dev dev1(dev)$ git branch --no-track feature/feature1 origin/dev #   feature/feature1  origin/dev,      dev1(dev)$ git push origin feature/feature1 #     ,      Total 0 (delta 0), reused 0 (delta 0) To /home/sirex/proj/git-habr/origin * [new branch] feature/feature1 -> feature/feature1 

 git fetch origin #    git rebase -i origin/dev # ,     ,    feature1    dev   .  origin/dev,   dev       ,       git checkout dev #   ,      git merge feature/feature1 #   git reset --hard feature/feature1.       .  ,   fast-forward. 

 dev1(dev)$ git push origin dev Counting objects: 11, done. Delta compression using up to 4 threads. Compressing objects: 100% (9/9), done. Writing objects: 100% (9/9), 878 bytes, done. Total 9 (delta 6), reused 0 (delta 0) Unpacking objects: 100% (9/9), done. To /home/sirex/proj/git-habr/origin 3272f59..e514869 dev -> dev dev1(dev)$ git push origin :feature/feature1 #   ,   To /home/sirex/proj/git-habr/origin - [deleted] feature/feature1 dev1(dev)$ git branch -d feature/feature1 #   Deleted branch feature/feature1 (was e514869). 

लंबे समय तक रहने वाली सुविधा शाखाएं

 dev1(dev)$ git checkout -b feature/long Switched to a new branch 'feature/long' dev1(feature/long)$ git push origin dev Everything up-to-date dev1(feature/long)$ __ dev1(feature/long)$ git push origin feature/long Counting objects: 11, done. Delta compression using up to 4 threads. Compressing objects: 100% (9/9), done. Writing objects: 100% (9/9), 807 bytes, done. Total 9 (delta 6), reused 0 (delta 0) Unpacking objects: 100% (9/9), done. To /home/sirex/proj/git-habr/origin * [new branch] feature/long -> feature/long 

 dev2(dev)$ git pull remote: Counting objects: 11, done. remote: Compressing objects: 100% (9/9), done. remote: Total 9 (delta 6), reused 0 (delta 0) Unpacking objects: 100% (9/9), done. From /home/sirex/proj/git-habr/origin * [new branch] feature/long -> origin/feature/long Already up-to-date. dev2(dev)$ git checkout feature/long Branch feature/long set up to track remote branch feature/long from origin. Switched to a new branch 'feature/long' dev2(feature/long)$    dev2(feature/long)$ git pull --rebase feature/long # fetch + rebase   dev2(feature/long)$ git push origin feature/long Counting objects: 11, done. Delta compression using up to 4 threads. Compressing objects: 100% (9/9), done. Writing objects: 100% (9/9), 795 bytes, done. Total 9 (delta 6), reused 0 (delta 0) Unpacking objects: 100% (9/9), done. To /home/sirex/proj/git-habr/origin baf4c6b..ce9e58d feature/long -> feature/long 

 dev1(feature/long)$ git fetch origin dev1(feature/long)$ git rebase -i origin/dev ...  ,  ,  .. 

 dev1(feature/long)$ git push origin feature/long To /home/sirex/proj/git-habr/origin ! [rejected] feature/long -> feature/long (non-fast-forward) error: failed to push some refs to '/home/sirex/proj/git-habr/origin' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (eg 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. 

 dev1(feature/long)$ git push origin feature/long --force Counting objects: 20, done. Delta compression using up to 4 threads. Compressing objects: 100% (18/18), done. Writing objects: 100% (18/18), 1.58 KiB, done. Total 18 (delta 12), reused 0 (delta 0) Unpacking objects: 100% (18/18), done. To /home/sirex/proj/git-habr/origin + ce9e58d...84c3001 feature/long -> feature/long (forced update) 

 dev2(feature/long)$ git fetch origin remote: Counting objects: 20, done. remote: Compressing objects: 100% (18/18), done. remote: Total 18 (delta 12), reused 0 (delta 0) Unpacking objects: 100% (18/18), done. From /home/sirex/proj/git-habr/origin + ce9e58d...84c3001 feature/long -> origin/feature/long (forced update) 

 git rebase -i --onto origin/feature/long feature/long~1 feature/long 

1. हम सुविधा / लंबे समय पर हैं, जो नए से पूरी तरह से अलग है, लेकिन इसमें वह प्रतिबद्धता है जो हमें चाहिए (1, अंतिम)
2. हम मूल / सुविधा / लंबे (शाखा में नई शुरुआत) के लिए पुनर्निर्माण करते हैं
3. शाखा ही यह सुविधा / लंबी है
4. लेकिन यह सब पुनर्निर्माण करने के लिए आवश्यक नहीं है (एक सामान्य शुरुआत की खोज और सभी कमिट्स के पुनर्निर्माण की आवश्यकता नहीं है, वे पहले से ही वहां मौजूद हैं), लेकिन केवल पिछले प्रतिबद्ध (समावेशी नहीं) से शुरू हो रहा है। यानीसुविधा के साथ / लंबे ~ 1

 dev2(feature/long)$ git rebase -i --onto origin/feature/long feature/long~1 feature/long Successfully rebased and updated refs/heads/feature/long. 

 git reset --hard origin/feature/long && git cherry-pick commit_id # commit_id   , ..  reset      

वे हॉटफ़िक्स

 git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev 
 git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev 
 git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev  git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev 
 git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev  git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev 
 git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev  git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev 
 git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev  git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev 
 git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev  git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev 
 git tag     '/'   . 
 
   hotfix-  : 
   hotfix  tag  master   ( cherry-pick  ,   -  )         cherry-pick     ,     .   . 
      git: 
 dev2(feature/long)$ git checkout master Switched to branch 'master' dev2(master)$ git tag release/1.0 #   ,     dev2(master)$ git checkout -b hotfix/1.0.x Switched to a new branch 'hotfix/1.0.x' dev2(hotfix/1.0.x)$ ..    dev2(hotfix/1.0.x)$ git push origin hotfix/1.0.x Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 302 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin * [new branch] hotfix/1.0.x -> hotfix/1.0.x dev2(hotfix/1.0.x)$ git tag release/1.0.1 #   dev2(hotfix/1.0.x)$ git checkout dev #     Switched to branch 'dev' dev2(dev)$ git cherry-pick release/1.0.1 #   id,       . #   ,     git commit dev2(dev)$ git commit [dev 9982f7b] Added rahqueiraiheinathiav 1 file changed, 1 insertion(+) dev2(dev)$ git push origin dev Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 328 bytes, done. Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. To /home/sirex/proj/git-habr/origin b21f8a5..9982f7b dev -> dev 

सभी प्रकार की उपयोगिता

 9982f7b Finally make test works b21f8a5 Fixed typo in Test 3eabaab Fixed typo in Test e514869 Added Test for Foo b4439a2 Implemented Method for Foo 250adb1 Added class Foo 

 dev2(dev)$ git rebase -i dev~6 # ..       origin/dev       dev2(dev)$ git rebase -i origin/dev 

 0f019d0 Added Test for class Foo a3ae806 Implemented class Foo 

 git config --global user.name sirex git config --global user.email jsirex@gmail.com 

1. बिल्ड को रिलीज़ करने के लिए, एक अलग शाखा बनाई गई थी, जहाँ सभी सुविधाएँ विलीन हो गईं ( git merge --no-ff)
2. शाखा को परीक्षण के लिए दिया गया था
3. इसकी शाखाओं में विकास जारी रहा
4. नए परिवर्तन फिर से विलय ( git merge --no-ff)
5. , .
6. - , dev .
7. , ,

निष्कर्ष

• Git , , . .
• git, , - , . .
• git " , ". . .
• . , git, git' , . , git gui plugin for %YOUR_IDE%, .
• . 2 , , - . wiki .
• , , , , , , - git .
• , , - git .