Git ΠΠ°ΠΊ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½ΠΈΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π² ΠΎΠ΄ΠΈΠ½
git rebase -i HEAD~3 pick f392171 Added new feature X squash ba9dd9a Added new elements to page design squash df71a27 Updated CSS for new elements ...
git rebase -i HEAD~3 pick f392171 Added new feature X squash ba9dd9a Added new elements to page design squash df71a27 Updated CSS for new elements ...
$ git push origin --delete <branch_name> $ git branch -d <branch_name> ΠΈΠ»ΠΈ git push origin :branchname ...
Π§ΡΠΎΠ±Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π²ΡΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ Π² Git Π½ΡΠΆΠ½ΠΎ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ»Π΅Π΄ΡΡΡΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ: git branch | grep -v "master" | xargs git branch -D ...
ΠΏΠΎ ΠΏΡΡΠΈ ΡΠΈΠΏΠ° C:\Users%username% Π² ΡΠ°ΠΉΠ»Π΅ .gitconfig Π½ΡΠΆΠ½ΠΎ: Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π² ΠΊΠΎΠ½ΡΠ΅: [difftool "vsdiffmerge"] path = C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe cmd = \"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" [mergetool "vsdiffmerge"] path = C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe cmd = "\"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe\" /m \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" " ΡΠΎΠ»ΡΠΊΠΎ ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΡΡΡ ΠΊ visual studio ΠΈ Π² Π½Π°ΡΠ°Π»Π΅ ΡΠ°ΠΉΠ»Π΅ ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠ΅ΠΌ Π²Ρ Π±ΡΠ΄Π΅ΡΠ΅...
ΠΠΎΠ΄Π°ΠΉΡΠ΅ Π²ΡΠ΄Π΄Π°Π»Π΅Π½Π΅ Π΄ΠΆΠ΅ΡΠ΅Π»ΠΎ, Π½Π°Π·Π²ΡΡΡ ΠΉΠΎΠ³ΠΎ βupstreamβ: git remote add upstream https://github.com/whoever/whatever.git ΠΡΡΠΈΠΌΠ°ΡΠΈ Π²ΡΡ Π³ΡΠ»ΠΊΠΈ ΡΡΠΎΠ³ΠΎ Π΄ΠΆΠ΅ΡΠ΅Π»Π° Π² Π³ΡΠ»ΠΊΠΈ Π²ΡΠ΄Π΄Π°Π»Π΅Π½ΠΎΠ³ΠΎ Π²ΡΠ΄ΡΡΠ΅ΠΆΠ΅Π½Π½Ρ, ΡΠ°ΠΊΠΈΡ , ΡΠΊ upstream / master: git fetch upstream ΠΠ΅ΡΠ΅ΠΊΠΎΠ½Π°ΠΉΡΠ΅ΡΡ, ΡΠΎ Π²ΠΈ ΠΏΠ΅ΡΠ΅Π±ΡΠ²Π°ΡΡΠ΅ Ρ Π³ΠΎΠ»ΠΎΠ²Π½ΡΠΉ Π³ΡΠ»ΡΡ: git checkout master ΠΠ΅ΡΠ΅ΠΏΠΈΡΡΡΡ ΡΠ²ΠΎΡ Π³ΠΎΠ»ΠΎΠ²Π½Ρ Π³ΡΠ»ΠΊΡ ΡΠ°ΠΊ, ΡΠΎΠ± Π±ΡΠ΄Ρ-ΡΠΊΡ Π²Π°ΡΡ ΠΠΎΠΌΡΡΠΎ ΡΠΊΡ ΡΠ΅ Π½Π΅ Π·Π½Π°Ρ ΠΎΠ΄ΡΡΡΡΡ Π² upstream / master Π±ΡΠ»ΠΈ Π²Π³ΠΎΡΡ ΠΠ½ΡΠ° Π³ΡΠ»ΠΊΠ°: git rebase upstream/master Π°Π±ΠΎ git merge upstream/master http://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository...