Skip to content

Instantly share code, notes, and snippets.

@mike-gusiev

mike-gusiev/git.txt

Last active February 2, 2017 09:41
Show Gist options
  • Save mike-gusiev/7b5328f7415d330832a2 to your computer and use it in GitHub Desktop.
Save mike-gusiev/7b5328f7415d330832a2 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. mike-gusiev revised this gist Feb 2, 2017. 1 changed file with 2 additions and 0 deletions.
    2 changes: 2 additions & 0 deletions git.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,7 @@
    git log --pretty=format:"%h - %an, %ar : %s"

    alias glop="git log --pretty=format:'%C(yellow)%h|%Cred%ad|%Cblue%an|%Cgreen%d %Creset%s' --date=short | column -ts'|' | less -r"

    git log --since=2.days

    git log -p -2
  2. mike-gusiev revised this gist Sep 1, 2015. 1 changed file with 6 additions and 1 deletion.
    7 changes: 6 additions & 1 deletion git.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -19,4 +19,9 @@ git merge master
    git mergetool

    git config --global push.default matching - пушаются все ветки которые есть на сервере
    git config --global push.default simple - пушается только текущая ветка (по умолчанию)
    git config --global push.default simple - пушается только текущая ветка (по умолчанию)

    //удалить предыдущий комит
    git log
    git reset --hard c6242d42d9c2b2dcc070a2b8d9cca64ccb3f8805
    git push --force origin bugfix/LLR-280
  3. mike-gusiev created this gist Jul 26, 2015.
    22 changes: 22 additions & 0 deletions git.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,22 @@
    git log --pretty=format:"%h - %an, %ar : %s"

    git log --since=2.days

    git log -p -2

    git config --global core.editor "'C:\Program Files (x86)\Notepad++\notepad++.exe' -multiInst -notabbar -nosession -noPlugin"

    git checkout -b new_branch
    git branch -v

    git branch new_branch2
    git checkout new_branch2

    git config --global merge.tool kdiff3
    git config --global mergetool.kdiff3.cmd '"C:\\Program Files\\KDiff3\\kdiff3" $BASE $LOCAL $REMOTE -o $MERGED'

    git merge master
    git mergetool

    git config --global push.default matching - пушаются все ветки которые есть на сервере
    git config --global push.default simple - пушается только текущая ветка (по умолчанию)