困ったときに使うgitのコマンドまとめ

$ git merge このブランチ あのブランチ

$ git checkout -b 新規作成するブランチ ベースとなるリモートブランチ
$ git push -u origin 新規作成するブランチ

// 例)
// git checkout -b new-branch origin/master
// git push -u origin new-branch

$ git checkout -b 新規作成するローカルブランチ名 ローカルに持ってきたいリモートブランチ名

// 例) git checkout -b okano/review origin/okano/review

$ git log --oneline

AAAAAAA コミットA
BBBBBBB コミットB
CCCCCCC コミットC
DDDDDDD コミットD
EEEEEEE コミットE

// 特定のコミットから最新までのコミットをまとめる場合
$ git rebase -i EEEEEEE

// 最新から5番目までのコミットをまとめる場合
$ git rebase -i HEAD~5

s AAAAAAA コミットA
s BBBBBBB コミットB
s CCCCCCC コミットC
s DDDDDDD コミットD
pick EEEEEEE コミットE

# Rebase AAAAAAA..EEEEEEE onto XXXXXXX
#
# 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.
#
# Note that empty commits are commented out

# This is a combination of 5 commits.
# The first commit's message is:

機能追加対応

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# Not currently on any branch.
# Changes to be committed:
#   (use "git reset HEAD ..." to unstage)
#
# modified:   HttpRequest.php
#

$ git push -f

error: Your local changes to the following files would be overwritten by checkout:
    対象ファイル
Please, commit your changes or stash them before you can switch branches.
error: The following untracked working tree files would be overwritten by checkout:
    対象ファイル
Please move or remove them before you can switch branches.
Aborting

$ git status

Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

    modified:   修正中のファイル

$ git stash save
Saved working directory and index state WIP on XXXXX: xxxxx

$ git status
On branch master
Your branch is up to date with 'origin/master'.

$ git stash list
stash@{0}: WIP on XXXXX: xxxxx

$ git stash pop stash@{0}
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

    modified:   修正中のファイル