mirror of https://github.com/nwchemgit/nwchem.git synced 2026-07-21 06:25:21 -04:00

History

edoapra 5b98776e49 branch check in release tarball creation [ci skip]		2025-10-24 15:26:10 -07:00
..
authors.txt	list used during conversion	2017-11-19 10:16:19 -08:00
dotar68_git.sh	Fix bash shebangs: make /usr/bin/env find bash in paths	2021-11-07 14:06:22 -08:00
dotar_release.sh	branch check in release tarball creation [ci skip]	2025-10-24 15:26:10 -07:00
download_count_releases.sh	update [ci skip]	2021-11-16 10:57:12 -08:00
emsl_logo.svg	emsl log in svg format	2018-08-15 16:24:49 -07:00
emsl_logo2.svg	update	2020-02-26 18:33:06 -08:00
generate_changelog.sh	script update [ci ski]	2023-01-13 16:24:34 -08:00
github_actions_selfhosted.txt	bump actions/checkout and actions/cache [ci skip]	2024-01-22 10:00:09 -08:00
github_actions_tahoma.txt	removed erroneous last commit [ci skip]	2023-10-16 10:16:23 -07:00
github_actions_tahoma_test.txt	test github action [ci skip]	2023-09-21 16:56:55 -07:00
MS3_logo.png	NWChem logo	2017-11-29 16:51:01 -08:00
MS3_logo_cropped.png	NWChem logo cropped	2017-11-29 17:01:46 -08:00
README.md	Make bandit a mandatory test and fix some typos	2021-10-30 02:11:52 +02:00
README_git_bits.md	Make bandit a mandatory test and fix some typos	2021-10-30 02:11:52 +02:00
update_main.txt	bump actions/checkout and actions/cache [ci skip]	2024-01-22 10:00:09 -08:00
use6432y.patch	patch to set USE_64TO32=y on release tarballs	2020-02-07 11:58:47 -08:00

README.md

How to fix bizarre check-ins

Case when committer got in bizarre state on this git repository and the changes have been pushed already to github.com
git log showed

$ git log
commit d890621e5d1b664ebb94683e804e859f527a41aa
Merge: 86c8a48 a7055a2
Author: Niri Govind niri.govind@pnnl.gov
Date: Mon Nov 27 15:07:35 2017 -0800

Merge branch 'master' of https://github.com/nwchemgit/nwchem

commit a7055a28bc
Author: edoapra edoardo.apra@gmail.com
Date: Mon Nov 27 14:14:54 2017 -0800

svn replaced by git

let's go back to the previous commit a7055a28bc

$ git reset --hard a7055a28bc

Check that everything is good with gitg
Push everything back to github.com

$ git push -f

Full log was ...
Branch: refs/heads/master
Home: https://github.com/nwchemgit/nwchem
Commit: 68ac6c4ac3f284a8c1fa7dad82f41b22c039927e
68ac6c4ac3
Author: Niri Govind niri.govind@pnnl.gov
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
src/nwdft/rt_tddft/rtutils/rt_tddft_movecs_import.F

Log Message:
minor edit to reflect the initial density matrix

Commit: 2447af6b3899c46408f645dc32d5928036177987
2447af6b38
Author: Niri Govind niri.govind@pnnl.gov
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
A docs/Capabilities
A docs/_config.yml
A docs/_layouts/default.html
A docs/assets/css/style.scss
A docs/assets/images/checker.png
A docs/assets/js/scale.fix.js
A docs/index.html
A docs/index2.html
M src/nwpw/nwpw_input.F

Log Message:
Merge branch 'master' of https://github.com/nwchemgit/nwchem

Commit: 86c8a484492300231fb8d18666e17bfa77f1f1c9
86c8a48449
Author: Niri Govind niri.govind@pnnl.gov
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
R docs/Capabilities
R docs/_config.yml
R docs/_layouts/default.html
R docs/assets/css/style.scss
R docs/assets/images/checker.png
R docs/assets/js/scale.fix.js
R docs/index.html
R docs/index2.html

Log Message:
Merge branch 'master' of https://github.com/nwchemgit/nwchem

Commit: d890621e5d1b664ebb94683e804e859f527a41aa
d890621e5d
Author: Niri Govind niri.govind@pnnl.gov
Date: 2017-11-27 (Mon, 27 Nov 2017)

Changed paths:
A .travis.yml
M README.md
M src/util/util_nwchem_version.bash
A travis/build_openblas.sh
A travis/build_scalapack.sh
A travis/sleep_loop.sh

Log Message:
Merge branch 'master' of https://github.com/nwchemgit/nwchem

Compare: a7055a28bc...d890621e5d