Advertisement
SantaBoom

0_o

Jun 7th, 2017
532
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.78 KB | None | 0 0
  1. student@ubuntu:~/git/SantaBoom/OpenMeschersky$ git log origin/task-051.014 -5
  2. commit bd4db26483c1d19e6e10b5ffe348c25c9f02642e
  3. Author: SantaBoom <frost98.04@inbox.ru>
  4. Date: Wed Jun 7 17:12:20 2017 +0400
  5.  
  6. Update 051.014.answer.tex
  7.  
  8. commit 97a87f0193e3608329d711e36477c15974fe71cb
  9. Author: SantaBoom <frost98.04@inbox.ru>
  10. Date: Wed Jun 7 16:07:40 2017 +0300
  11.  
  12. Задача 051.014
  13.  
  14. commit d0c0df3ad5a5b468c7d749a232331b7979c4d8cf
  15. Author: SantaBoom <frost98.04@inbox.ru>
  16. Date: Tue Jun 6 20:18:16 2017 +0400
  17.  
  18. Update 027.042.answer.tex
  19.  
  20. Проблема с дробью исправлен.
  21.  
  22. commit d650d80d3848411b1b88f3eb05bbc2f021ddf76b
  23. Author: SantaBoom <frost98.04@inbox.ru>
  24. Date: Tue Jun 6 19:56:46 2017 +0400
  25.  
  26. Update 027.042.answer.tex
  27.  
  28. Точку поставил.
  29.  
  30. commit a5b4a1942d553eba91fe4031affbb3505016d6f2
  31. Author: SantaBoom <frost98.04@inbox.ru>
  32. Date: Tue Jun 6 18:50:19 2017 +0300
  33.  
  34. Задача 027.042
  35. student@ubuntu:~/git/SantaBoom/OpenMeschersky$ git checkout task-051.014
  36. Warning: you are leaving 1 commit behind, not connected to
  37. any of your branches:
  38.  
  39. eba2dc5 Задача 051.014
  40.  
  41. If you want to keep it by creating a new branch, this may be a good time
  42. to do so with:
  43.  
  44. git branch <new-branch-name> eba2dc5
  45.  
  46. Switched to branch 'task-051.014'
  47. student@ubuntu:~/git/SantaBoom/OpenMeschersky$ git rebase -i origin/task-051.014 -3
  48. error: unknown switch `3'
  49. usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
  50. or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
  51. or: git-rebase --continue | --abort | --skip | --edit-todo
  52.  
  53. Available options are
  54. -v, --verbose display a diffstat of what changed upstream
  55. -q, --quiet be quiet. implies --no-stat
  56. --autostash automatically stash/stash pop before and after
  57. --fork-point use 'merge-base --fork-point' to refine upstream
  58. --onto ... rebase onto given branch instead of upstream
  59. -p, --preserve-merges
  60. try to recreate merges instead of ignoring them
  61. -s, --strategy ... use the given merge strategy
  62. --no-ff cherry-pick all commits, even if unchanged
  63. -m, --merge use merging strategies to rebase
  64. -i, --interactive let the user edit the list of commits to rebase
  65. -x, --exec ... add exec lines after each commit of the editable list
  66. -k, --keep-empty preserve empty commits during rebase
  67. -f, --force-rebase force rebase even if branch is up to date
  68. -X, --strategy-option ...
  69. pass the argument through to the merge strategy
  70. --stat display a diffstat of what changed upstream
  71. -n, --no-stat do not show diffstat of what changed upstream
  72. --verify allow pre-rebase hook to run
  73. --rerere-autoupdate allow rerere to update index with resolved conflicts
  74. --root rebase all reachable commits up to the root(s)
  75. --autosquash move commits that begin with squash
  76. move commits that begin with squash!/fixup! under -i
  77. --committer-date-is-author-date
  78. passed to 'git am'
  79. --ignore-date passed to 'git am'
  80. --whitespace ... passed to 'git apply'
  81. --ignore-whitespace passed to 'git apply'
  82. -C ... passed to 'git apply'
  83. -S, --gpg-sign[=...] GPG-sign commits
  84.  
  85. Actions:
  86. --continue continue
  87. --abort abort and check out the original branch
  88. --skip skip current patch and continue
  89. --edit-todo edit the todo list during an interactive rebase
  90.  
  91. student@ubuntu:~/git/SantaBoom/OpenMeschersky$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement