Is it possible to do git-rebase after running git-commit

Question

I began to rewrite some of the Perl programs from NASM source files. I already made some commits for my working copy , and I was wondering git pullif I should instead of doing if I should have done git rebase.

I pretty much decided what I had to do git rebase, but I don’t know how to reprocess my repository to achieve this effect or even if it is possible.

Answer 1

, Git Magic , . , - , . , .

? /?

- , , , , . ? , commit privileges — , , , . , , , . ?

rebase-vs-merge.

Answer 2

• , - : git log
• (, ): git reset HEAD^
  • HEAD ^ : " , HEAD"
• : git rebase origin/master

git fetch, rebase 3.

git, , . , ( git, tarball ).

Answer 3

:

:

up = pull --rebase origin

• "dev" -
• dev
• git up master
• git merge dev
• git

:

• git
• dev
• git up master

YMMV

Answer 4

You should be able to undo your last merge by changing these branches:

git branch your-changes <reflog of "Reworked test files...">
git branch -f master remotes/origin/master

After that, you can try rebooting.

Answer 5

As a continuation of Dustin's answer, it should be "git config --global branch.master.rebase true".