mucbuc / configs (public) (License: Unspecified) (since 2020-07-03) (hash sha1)
No description available
Clone URLs: https://rocketgit.com/user/mucbuc/configs ssh://rocketgit@ssh.rocketgit.com/user/mucbuc/configs git://git.rocketgit.com/user/mucbuc/configs
Merge request 3 (26c7761e2eafdad48f79e1723fca7be0a2e9b656 -> f8f80a1d644a1a6b8f5a257d54bc6412457208a3)
By: anonymous
Against ref: refs/heads/dev
Date: 2020-08-23 00:48
This merge request cannot be merged without conflicts.
Conflicts:
changed in both
base 100644 9eb1327cc77aa54789530ae804ce4324f891b343 README.md
our 100644 9d06e0b4b68686582edc9ebce3485e9a84149d3b README.md
their 100644 2f92a1ff52ab59c0fcc06a29aeeb7cd343a973f6 README.md
@@ -1,3 +1,4 @@
+
## Commands

./install.js
@@ -5,8 +6,11 @@
- copy editorconfig to ~/.editorconf
- copy gitconfig to ~/.gitconfig
- install marks_bash
+<<<<<<< .our

./templates.js
- create example.cpp
- create symlink to self in test/lib/

+=======
+>>>>>>> .their
List of commits:
Subject Hash Author Date (UTC)
wtf f8f80a1d644a1a6b8f5a257d54bc6412457208a3 mucbuc 2020-08-23 00:48:47
wtf 0eba11d8fb35c211156a357d3d010146607fac3d mucbuc 2020-08-23 00:47:50
wtf a44f37b17b8563a25fbdfef55dcefd8d831f4d2b mucbuc 2020-08-23 00:47:24
wtf c1cc938ab8ee389a1334a96de9a10c3675d6f6b7 mucbuc 2020-08-23 00:46:43
what 4839df1199ab25a83e4a6ae8f2ecc13b233384cc mucbuc 2020-08-23 00:45:16
installJrnl linted 6d458ea27e9658f8bce0f55ef158974ff686f8f4 mucbuc 2020-08-23 00:42:33
config 6f43061e5dca4fe444c6edc02cc05fd765aedb02 mucbuc 2020-08-22 00:04:25
cleanup 747caf7beb98cb45fe5e4d0f3b042855707f6f12 mucbuc 2020-08-21 19:20:23
Commit f8f80a1d644a1a6b8f5a257d54bc6412457208a3 - wtf
Author: mucbuc
Author date (UTC): 2020-08-23 00:48
Committer name: mucbuc
Committer date (UTC): 2020-08-23 00:48
Parent(s): 0eba11d8fb35c211156a357d3d010146607fac3d
Signing key:
Tree: 55029f69df70c246e058151eb9b0dd9a742724bb
File Lines added Lines deleted
installJrnl.js 3 3
File installJrnl.js changed (mode: 100755) (index 07861ad..ab0d0ee)
1 1 #!/usr/bin/env node #!/usr/bin/env node
2 2
3 const { exec, pushd } = require( 'shelljs' );
4 pushd( '~/.local/share/' );
5 exec( 'ln -s ~/Dropbox/jrnl .');
3 const { exec, pushd } = require( 'shelljs' );
4 pushd( '~/.local/share/' );
5 exec( 'ln -s ~/Dropbox/jrnl .');
Commit 0eba11d8fb35c211156a357d3d010146607fac3d - wtf
Author: mucbuc
Author date (UTC): 2020-08-23 00:47
Committer name: mucbuc
Committer date (UTC): 2020-08-23 00:47
Parent(s): a44f37b17b8563a25fbdfef55dcefd8d831f4d2b
Signing key:
Tree: 7e189cf38420ea969398a2d5cfe224bcc59d1f6a
File Lines added Lines deleted
README.md 1 1
File README.md changed (mode: 100644) (index 04b8188..2f92a1f)
1 1
2 ## Commands
2 ## Commands
3 3
4 4 ./install.js ./install.js
5 5 - copy vimrc to ~/.vimrc - copy vimrc to ~/.vimrc
Commit a44f37b17b8563a25fbdfef55dcefd8d831f4d2b - wtf
Author: mucbuc
Author date (UTC): 2020-08-23 00:47
Committer name: mucbuc
Committer date (UTC): 2020-08-23 00:47
Parent(s): c1cc938ab8ee389a1334a96de9a10c3675d6f6b7
Signing key:
Tree: 297a63484839463e3675f996dd3868ccbf2519cd
File Lines added Lines deleted
README.md 1 0
File README.md changed (mode: 100644) (index b607cef..04b8188)
1
1 2 ## Commands ## Commands
2 3
3 4 ./install.js ./install.js
Commit c1cc938ab8ee389a1334a96de9a10c3675d6f6b7 - wtf
Author: mucbuc
Author date (UTC): 2020-08-23 00:46
Committer name: mucbuc
Committer date (UTC): 2020-08-23 00:46
Parent(s): 4839df1199ab25a83e4a6ae8f2ecc13b233384cc
Signing key:
Tree: aec55f6ee65a4e77be6922ed2933ebc60b3acac2
File Lines added Lines deleted
README.md 0 2
File README.md changed (mode: 100644) (index c3fe70a..b607cef)
5 5 - copy editorconfig to ~/.editorconf - copy editorconfig to ~/.editorconf
6 6 - copy gitconfig to ~/.gitconfig - copy gitconfig to ~/.gitconfig
7 7 - install marks_bash - install marks_bash
8
9 test
Commit 4839df1199ab25a83e4a6ae8f2ecc13b233384cc - what
Author: mucbuc
Author date (UTC): 2020-08-23 00:45
Committer name: mucbuc
Committer date (UTC): 2020-08-23 00:45
Parent(s): 6d458ea27e9658f8bce0f55ef158974ff686f8f4
Signing key:
Tree: e474a5b98de87221ba0d53f845c0a3a358080775
File Lines added Lines deleted
README.md 1 1
File README.md changed (mode: 100644) (index ea585bc..c3fe70a)
6 6 - copy gitconfig to ~/.gitconfig - copy gitconfig to ~/.gitconfig
7 7 - install marks_bash - install marks_bash
8 8
9
9 test
Commit 6d458ea27e9658f8bce0f55ef158974ff686f8f4 - installJrnl linted
Author: mucbuc
Author date (UTC): 2020-08-23 00:42
Committer name: mucbuc
Committer date (UTC): 2020-08-23 00:42
Parent(s): 6f43061e5dca4fe444c6edc02cc05fd765aedb02
Signing key:
Tree: e2f2e5b88165f68fe23c3388d5e77900ab223e89
File Lines added Lines deleted
installJrnl.js 5 0
File installJrnl.js added (mode: 100755) (index 0000000..07861ad)
1 #!/usr/bin/env node
2
3 const { exec, pushd } = require( 'shelljs' );
4 pushd( '~/.local/share/' );
5 exec( 'ln -s ~/Dropbox/jrnl .');
Commit 6f43061e5dca4fe444c6edc02cc05fd765aedb02 - config
Author: mucbuc
Author date (UTC): 2020-08-22 00:04
Committer name: mucbuc
Committer date (UTC): 2020-08-22 00:04
Parent(s): 747caf7beb98cb45fe5e4d0f3b042855707f6f12
Signing key:
Tree: c712ae955895d5ced516b69f9877b5f3eb3bcdac
File Lines added Lines deleted
gitconfig 16 7
File gitconfig changed (mode: 100644) (index 0208fae..325ff7d)
1 1 [user] [user]
2 email = mbusenitz@gmail.com
3 name = mucbuc
2 email = mbusenitz@gmail.com
3 name = mucbuc
4 4 [rerere] [rerere]
5 enabled = 1
5 enabled = 1
6 [core]
7 repositoryformatversion = 0
8 filemode = true
9 bare = false
10 logallrefupdates = true
11 ignorecase = true
12 precomposeunicode = true
13 [remote "origin"]
14 url = https://rocketgit.com/user/mucbuc/configs
15 fetch = +refs/heads/*:refs/remotes/origin/*
16 [branch "dev"]
17 remote = origin
18 merge = refs/heads/dev
6 19 [fetch] [fetch]
7 20 prune = 1 prune = 1
8 21 [help] [help]
9 22 autocorrect = 1 autocorrect = 1
10 [alias]
11 ssb = status -sb
12 ls = ls-files
13 dw = diff --word-diff
Commit 747caf7beb98cb45fe5e4d0f3b042855707f6f12 - cleanup
Author: mucbuc
Author date (UTC): 2020-08-21 19:20
Committer name: mucbuc
Committer date (UTC): 2020-08-21 19:20
Parent(s): 26c7761e2eafdad48f79e1723fca7be0a2e9b656
Signing key:
Tree: f7c67d91ca081bb940a5ea818776edc808a2d46f
File Lines added Lines deleted
README.md 1 1
File README.md changed (mode: 100644) (index 9eb1327..ea585bc)
1 ## Commands
1 ## Commands
2 2
3 3 ./install.js ./install.js
4 4 - copy vimrc to ~/.vimrc - copy vimrc to ~/.vimrc
Hints:
How to merge on your machine?
git fetch origin refs/mr/3:mr-3
git checkout main
git merge mr-3

To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want, a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout main
git merge mr/3