Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- student@ubuntu:~/git/SantaBoom/OpenMeschersky$ git log origin/task-051.014 -5
- commit bd4db26483c1d19e6e10b5ffe348c25c9f02642e
- Author: SantaBoom <frost98.04@inbox.ru>
- Date: Wed Jun 7 17:12:20 2017 +0400
- Update 051.014.answer.tex
- commit 97a87f0193e3608329d711e36477c15974fe71cb
- Author: SantaBoom <frost98.04@inbox.ru>
- Date: Wed Jun 7 16:07:40 2017 +0300
- Задача 051.014
- commit d0c0df3ad5a5b468c7d749a232331b7979c4d8cf
- Author: SantaBoom <frost98.04@inbox.ru>
- Date: Tue Jun 6 20:18:16 2017 +0400
- Update 027.042.answer.tex
- Проблема с дробью исправлен.
- commit d650d80d3848411b1b88f3eb05bbc2f021ddf76b
- Author: SantaBoom <frost98.04@inbox.ru>
- Date: Tue Jun 6 19:56:46 2017 +0400
- Update 027.042.answer.tex
- Точку поставил.
- commit a5b4a1942d553eba91fe4031affbb3505016d6f2
- Author: SantaBoom <frost98.04@inbox.ru>
- Date: Tue Jun 6 18:50:19 2017 +0300
- Задача 027.042
- student@ubuntu:~/git/SantaBoom/OpenMeschersky$ git checkout task-051.014
- Warning: you are leaving 1 commit behind, not connected to
- any of your branches:
- eba2dc5 Задача 051.014
- If you want to keep it by creating a new branch, this may be a good time
- to do so with:
- git branch <new-branch-name> eba2dc5
- Switched to branch 'task-051.014'
- student@ubuntu:~/git/SantaBoom/OpenMeschersky$ git rebase -i origin/task-051.014 -3
- error: unknown switch `3'
- usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
- or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
- or: git-rebase --continue | --abort | --skip | --edit-todo
- Available options are
- -v, --verbose display a diffstat of what changed upstream
- -q, --quiet be quiet. implies --no-stat
- --autostash automatically stash/stash pop before and after
- --fork-point use 'merge-base --fork-point' to refine upstream
- --onto ... rebase onto given branch instead of upstream
- -p, --preserve-merges
- try to recreate merges instead of ignoring them
- -s, --strategy ... use the given merge strategy
- --no-ff cherry-pick all commits, even if unchanged
- -m, --merge use merging strategies to rebase
- -i, --interactive let the user edit the list of commits to rebase
- -x, --exec ... add exec lines after each commit of the editable list
- -k, --keep-empty preserve empty commits during rebase
- -f, --force-rebase force rebase even if branch is up to date
- -X, --strategy-option ...
- pass the argument through to the merge strategy
- --stat display a diffstat of what changed upstream
- -n, --no-stat do not show diffstat of what changed upstream
- --verify allow pre-rebase hook to run
- --rerere-autoupdate allow rerere to update index with resolved conflicts
- --root rebase all reachable commits up to the root(s)
- --autosquash move commits that begin with squash
- move commits that begin with squash!/fixup! under -i
- --committer-date-is-author-date
- passed to 'git am'
- --ignore-date passed to 'git am'
- --whitespace ... passed to 'git apply'
- --ignore-whitespace passed to 'git apply'
- -C ... passed to 'git apply'
- -S, --gpg-sign[=...] GPG-sign commits
- Actions:
- --continue continue
- --abort abort and check out the original branch
- --skip skip current patch and continue
- --edit-todo edit the todo list during an interactive rebase
- student@ubuntu:~/git/SantaBoom/OpenMeschersky$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement