[petsc-dev] git help needed

Svetlana Tkachenko svetlana.tkachenko at fastmail.fm
Tue Feb 18 23:21:55 CST 2014


You can `git reset --soft <previous item in git log>`, I think, switch to another branch, and commit twice (once to master and once to that branch).

----- Original message -----
From: Barry Smith <bsmith at mcs.anl.gov>
To: "petsc-dev" <petsc-dev at mcs.anl.gov>, Karl Rupp <rupp at mcs.anl.gov>
Subject: [petsc-dev] git help needed
Date: Tue, 18 Feb 2014 22:57:50 -0600


  I accidentally added and committed in master when I meant to do it in another branch. 

~/Src/petsc/src/ts/examples/tutorials  master $ git add ex1s.c
~/Src/petsc/src/ts/examples/tutorials  master $ git commit -a
[master 8bd0fc5] adding SNESPSEUDO solver
 5 files changed, 449 insertions(+), 1 deletion(-)
 create mode 100644 src/ts/examples/tutorials/ex1s.c

How do I undo this so I can switch to another branch and do the commits into that?

git revert help message is useless






More information about the petsc-dev mailing list