39 Rebasing Your Changes
39 Rebasing Your Changes
Command
1
$ git checkout master
Code output
1
2
3
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
Command
1
$ git pull
Code output
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
Remote: Enumerating objects: 5, done.
Remote: Counting objects: 100% (5/5), done.
Remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0
Unpacking objects: 10% (3/3), done.
From https://github.com/artwalker/healthchecks
58351ff..0789f64 master -> origin/master
Updating 58351ff..0789f64
Fast-forward
README.md | 2 ++
1 file changed, 2 insertions(+)
Command
1
$ git log --graph --oneline --all
Code output
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
* 0789f64 (HEAD -> master, origin/master, origin/HEAD) Add reference to all_checks.py to README
| * cbee3f7 (origin/refactor, refactor) Allow printing more than one error message
| * 75bdd43 Iterate over a list of checks and messages to avoid code duplication
| * e914aee Create wrapper function for check_disk_full
|/
* 58351ff Merge branch 'master' of https://github.com/artwalker/health-checks
|\
| * a2dc118 Reorder conditional to match parameter order
* | 03d23d0 Rename min_absolute to min_gb, use parameter names
|/
| * 4d99c56 (origin/experimental, experimental) Empty check_load function
|/
* 922d659 Add disk full check to all_checks.py
* b62dc2e Add initial files for the checks
* 807cb50 Add one more line to README.md
* 3d9f86c Initial commit
Command
1
$ git checkout refactor
Code output
1
2
3
Switched to branch 'refactor'
Your branch is up to date with 'origin/refactor'.
Command
1
$ git rebase master
Code output
1
2
3
4
5
6
7
First, rewinding head to replay your work on top of it...
Applying: Create wrapper function for check_disk_full
Applying: Iterate over a list of checks and messages to avoid code duplication
Applying: Allow printing more than one error message
Command
1
$ git log --graph --oneline
Code output
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
* f5813b1 (HEAD -> refactor) Allow printing more than one error message
* 18257a0 Iterate over a list of checks and messages to avoid code duplication
* e914aee Create wrapper function for check_disk_full
* 0789f64 (origin/master, origin/HEAD, master) Add reference to all_checks.py to README
* 58351ff Merge branch 'master' of https://github.com/artwalker/health-checks
|\
| * a2dc118 Reorder conditional to match parameter order
* | 03d23d0 Rename min_absolute to min_gb, use parameter names
|/
* 922d659 Add disk full check to all_checks.py
* b62dc2e Add initial files for the checks
* 807cb50 Add one more line to README.md
* 3d9f86c Initial commit
Command
1
$ git checkout master
Code output
1
2
3
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
Command
1
$ git merge refactor
Code output
1
2
3
4
5
6
7
Updating 0789f64..f5813b1
Fast-forward
all_checks.py | 24 +++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
Command
1
$ git push --delete origin refactor
Code output
1
2
3
4
5
6
7
Username for 'https://github.com': artwalker
Password for 'https://artwalker@github.com':
To https://github.com/artwalker/health-checks.git
- [deleted] refactor
Command
1
$ git branch -d refactor
Code output
1
Deleted branch refactor (was f5813b1).
Command
1
$ git push
Code output
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
Enumerating objects: 11, done.
Counting objects: 100% (11/11), done.
Delta compression using up to 4 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.37 KiB | 1.37 MiB/s, done.
Total 9 (delta 3), reused 0 (delta 0)
remote: Resolving deltas: 100% (3/3), completed with 1 local object.
To https://github.com/artwalker/health-checks.git
0789f64..f5813b1 master -> master
This post is licensed under CC BY 4.0 by the author.