... | ... | @@ -12,6 +12,8 @@ This is equivalent to "git branch osx-redirect" followed by "git checkout osx-re |
|
|
|
|
|
This web page was useful: https://www.atlassian.com/git/tutorials/learn-git-with-bitbucket-cloud/git-branch-to-merge
|
|
|
|
|
|
"git status" shows the current state of the branch. We need to add the two modified files before committing them:
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git status
|
|
|
On branch osx-redirect
|
... | ... | @@ -144,6 +146,9 @@ index c323ac5..bf4ddd0 100755 |
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsSimpleCropModel.xml.txt
|
|
|
|
|
|
ppmmro02:OpenSimRoot pmzmro$
|
|
|
```
|
|
|
Then "git commit -m "MESSAGE":
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git commit -m "Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX"
|
|
|
[osx-redirect ba37b15] Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX
|
... | ... | @@ -163,24 +168,9 @@ After doing this, you may fix the identity used for this commit with: |
|
|
2 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
```
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git commit -m "Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX"
|
|
|
[osx-redirect ba37b15] Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX
|
|
|
Committer: Markus Owen <pmzmro@ppmmro02.maths.nottingham.ac.uk>
|
|
|
Your name and email address were configured automatically based
|
|
|
on your username and hostname. Please check that they are accurate.
|
|
|
You can suppress this message by setting them explicitly. Run the
|
|
|
following command and follow the instructions in your editor to edit
|
|
|
your configuration file:
|
|
|
|
|
|
git config --global --edit
|
|
|
|
|
|
After doing this, you may fix the identity used for this commit with:
|
|
|
|
|
|
git commit --amend --reset-author
|
|
|
Change the email address, then amend the commit message and check the status:
|
|
|
|
|
|
2 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git config --global --edit
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git config --global user.email markus.owen@nottingham.ac.uk
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git commit --amend --reset-author
|
|
|
[osx-redirect 725cfbb] Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX
|
... | ... | @@ -203,6 +193,11 @@ Untracked files: |
|
|
OpenSimRoot/tests/modules/testResults/
|
|
|
|
|
|
nothing added to commit but untracked files present (use "git add" to track)
|
|
|
```
|
|
|
|
|
|
Finally, push the changes to the branch:
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git push origin osx-redirect
|
|
|
Counting objects: 8, done.
|
|
|
Delta compression using up to 4 threads.
|
... | ... | |