|
|
This creates a branch named "osx-redirect" and checks it out.
|
|
|
This creates a branch named `osx-redirect` and checks it out.
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git checkout -b osx-redirect
|
... | ... | @@ -8,11 +8,11 @@ Switched to a new branch 'osx-redirect' |
|
|
ppmmro02:OpenSimRoot pmzmro$
|
|
|
```
|
|
|
|
|
|
This is equivalent to "git branch osx-redirect" followed by "git checkout osx-redirect".
|
|
|
This is equivalent to `git branch osx-redirect` followed by `git checkout osx-redirect`.
|
|
|
|
|
|
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:
|
|
|
`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
|
... | ... | @@ -67,7 +67,7 @@ Untracked files: |
|
|
ppmmro02:OpenSimRoot pmzmro$
|
|
|
```
|
|
|
|
|
|
Use "git diff HEAD" to see what has changed:
|
|
|
Use `git diff HEAD` to see what has changed:
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git diff HEAD
|
... | ... | @@ -147,7 +147,7 @@ index c323ac5..bf4ddd0 100755 |
|
|
|
|
|
ppmmro02:OpenSimRoot pmzmro$
|
|
|
```
|
|
|
Then "git commit -m "MESSAGE":
|
|
|
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"
|
... | ... | |