git fix commits messages

user@laptop:/mnt/sandbox/src/apstat$ git rebase -i c3e1531fe390a7867a36f283c0e161de2c424dce # parent
Rebasing (1/1)
You can amend the commit now, with

git commit --amend

Once you are satisfied with your changes, run

git rebase --continue

user@laptop:/mnt/sandbox/src/apstat$ git commit --amend apstat.py
Created commit 84a9cba: Fix: splitting and assigning cmd_list array in length check
1 files changed, 35 insertions(+), 39 deletions(-)
user@laptop:/mnt/sandbox/src/apstat$ git rebase --continue
Successfully rebased and updated refs/heads/master.
user@laptop:/mnt/sandbox/src/apstat$ git push --all origin
To git://git.yourdomain.ru/apstat.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to 'git://git.yourdomain.ru/apstat.git'
user@laptop:/mnt/sandbox/src/apstat$ git pull
Merge made by recursive.
user@laptop:/mnt/sandbox/src/apstat$ git push --all origin
Counting objects: 2, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 562 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To git://git.yourdomain.ru/apstat.git
6713dac..c32e9c3 master -> master
user@laptop:/mnt/sandbox/src/apstat$ git log
commit c32e9c37fb8302466293691827347ce9f908f3f3
Merge: 84a9cba... 6713dac...
Author: author
Date: Thu Apr 15 03:44:16 2010 +0400

Merge branch 'master' of git://git.yourdomain.ru/apstat

commit 84a9cbad7cba7c0dd204d12cfa7fb02a1e4043db
Author: author
Date: Thu Apr 15 02:44:31 2010 +0400

Fixed commit

[skip]

No comments:

Post a Comment