From 446f97f8187b3c17cbdfd194756dd377e9fb984d Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Tue, 22 Apr 2008 21:21:55 +0200 Subject: [PATCH] more todo updates --- todo | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/todo b/todo index bae5d31..d423b38 100644 --- a/todo +++ b/todo @@ -39,6 +39,7 @@ Bugs * calling 'changes' with an incorrect sha1 gives; command: git whatchanged -m --pretty=raw 70dcca2e1096117d205aa12b114ccf4afa09d3fa ERROR: Failed calling git +* vng add does not look at the .gitignore file use git-read-tree --reset HEAD and git-update-index --refresh to implement 'check' @@ -55,4 +56,22 @@ pull; [09:31] brad: and later remove the branch again with git push :name-of-new-branch [09:31] ahh, cool +amend-record + git checkout -b tmp HEAD~5 # rewind to the commit in question + vi file.c # edit the file + git commit --amend file.c # redo the commit without deleting the commit + git rebase --onto tmp master~5 master # replay the later changes + git branch -D tmp # clean up the temporary branch + + Where there are a number of files to amend you are probably better off using: + git checkout -b tmp HEAD~5 # rewind to the commit in question + git reset HEAD^ # delete the commit at the now current point + vi file1.c # edit + vi file2.c # the files + git commit -a -c ORIG_HEAD # redo the commit incorporating all changed files + git rebase --onto tmp master~5 master # replay the later changes + git branch -D tmp # clean up the temporary branch + + +http://wiki.winehq.org/GitWine -- 2.11.4.GIT