...
- -a , --all : Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected.
- --p , --patch : Use the interactive patch selection interface to chose which changes to commit. See git-add[1] for details.
- -C <commit> , --reuse-message=<commit> : Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit.
- -c <commit> , --reedit-message=<commit> : Like -C, but with
-c
the editor is invoked, so that the user can further edit the commit message. - --squash=<commit> : Construct a commit message for use with
rebase --autosquash
. - --branch : Show the branch and tracking info even in short-format.
- -F <file> , --file=<file> : Take the commit message from the given file. Use - to read the message from the standard input.
...
Shows the commits that aren't pushed.
rebase
Reapply commits on top of another base tip.
Options :
- -i , --interactive : Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing.
- --continue : Restart the rebasing process after having resolved a merge conflict.
- --abort :Abort the rebase operation and reset HEAD to the original branch.
- --quit : Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result.
- --onto <newbase> : Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name.
- --skip : Restart the rebasing process by skipping the current patch.
- --edit-todo : Edit the todo list during an interactive rebase.
- -m ,–merge :Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side.
- --show-current-patch :Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of
git show REBASE_HEAD
.