-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgit.log
More file actions
125 lines (108 loc) · 5.31 KB
/
git.log
File metadata and controls
125 lines (108 loc) · 5.31 KB
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
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
chaschel@xia:~/Documents/ibm/go/apps/restate$ gut -h
Gut is a powerful command-line interface (CLI) designed to make Git easier to use.
Effortlessly version control your projects with Gut.
Usage:
gut [flags]
gut [command]
Available Commands:
attributes Add a gitattributes file
branch List all branches
clone Clone a repository from a remote
completion Generate the autocompletion script for the specified shell
diff Show changes between commits, and the working tree (requires git)
explain Get the equivalent git command
fix Fix your mess
goto Switch temporarily your working tree to an old commit
help Help about any command
history Search across your Git history
ignore Download a .gitignore template
init Initialize a new Git repository
merge Merge a branch into the current one
profile Manage your profiles
remote List remote repositories
reset Rollback files specified to the last commit (require git)
revert Revert to a specified commit (require Git)
save Save (commit) your current work locally
setup Alias of 'init'
squash Squash your commits from HEAD to a specific commit
status Show a list of modified files
switch Change the current branch
sync Sync your local changes with the remote repository
telemetry Enable or disable telemetry
undo Rollback files specified to the last commit (require git)
version Show Gut version
whereami Print the current branch and the hash of the HEAD
Flags:
-h, --help help for gut
-v, --version Print the version of Gut and the release date
Use "gut [command] --help" for more information about a command.
chaschel@xia:~/Documents/ibm/go/apps/restate$ git pull
remote: Enumerating objects: 13, done.
remote: Counting objects: 100% (13/13), done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 12 (delta 7), reused 0 (delta 0), pack-reused 0 (from 0)
Unpacking objects: 100% (12/12), 8.91 KiB | 2.23 MiB/s, done.
From https://github.com/PithomLabs/restate-examples
4fb0136..8973cac master -> origin/master
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> master
chaschel@xia:~/Documents/ibm/go/apps/restate$ git branch --set-upstream-to=origin/<branch> master
bash: branch: No such file or directory
chaschel@xia:~/Documents/ibm/go/apps/restate$ gut branch
Here is the list of all branches:
* master
chaschel@xia:~/Documents/ibm/go/apps/restate$ git branch --set-upstream-to=origin/master master
branch 'master' set up to track 'origin/master'.
chaschel@xia:~/Documents/ibm/go/apps/restate$ git pull
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
chaschel@xia:~/Documents/ibm/go/apps/restate$ git pull origin master
From https://github.com/PithomLabs/restate-examples
* branch master -> FETCH_HEAD
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
chaschel@xia:~/Documents/ibm/go/apps/restate$ git pull origin master --no-rebase
From https://github.com/PithomLabs/restate-examples
* branch master -> FETCH_HEAD
Merge made by the 'ort' strategy.
FAQ.MD | 363 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 363 insertions(+)
create mode 100644 FAQ.MD
chaschel@xia:~/Documents/ibm/go/apps/restate$ git push -u origin master
Enumerating objects: 22, done.
Counting objects: 100% (17/17), done.
Delta compression using up to 16 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 13.17 MiB | 3.46 MiB/s, done.
Total 10 (delta 5), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (5/5), completed with 4 local objects.
To https://github.com/PithomLabs/restate-examples
8973cac..6cb95d1 master -> master
branch 'master' set up to track 'origin/master'.
chaschel@xia:~/Documents/ibm/go/apps/restate$