IRCloggy #git 2017-10-29

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2017-10-29

← jrabe left00:00
← kozy left00:00
akk It has changes to be committed [another file], then Unmerged paths: both modified: [filename]00:00
→ V7 joined00:00
thiago ok, so it's a "both modified"00:00
V7 Hey all ;)00:00
gitinfo V7: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.00:00
thiago the file should have <<< markers00:00
V7 Who wrote whatis for git ?00:00
→ jrabe joined00:00
← leeN left00:01
→ SwiftMatt joined00:01
akk thiago: It doesn't have <<< markers. The first time I tried this, it did, but then I did git rebase --abort and eventually a git reset --hard HEAD00:01
and now, doing a merge or rebase doesn't change the file or add <<< markers.00:02
thiago akk: you may have rerere enabled, in which case it's reusing the resolution from last time00:02
akk Ah. How do I disable that?00:02
→ leeN joined00:02
thiago git config rerere.enabled false00:02
akk Then git rebase --abort and git rebase master again?00:03
← wxg left00:03
thiago yes00:03
V7 Btw "$whatis git" returns strange output00:04
→ masuberu joined00:04
akk Thanks, that was it, now it has the <<< markers.00:04
I think this worked -- thanks, thiago!00:06
→ wxg joined00:06
← oojacoboo left00:06
akk Hmm, but now, it seems to be happy with the merge but it doesn't seem to have anything to commit or push.00:07
thiago it's possible your fix made the file identical to what it was00:08
so, git rebase --skip00:08
→ cdg joined00:09
→ Raed|Mobile joined00:09
akk git status on the branch says, "Your branch and 'origin/python3-port' have diverged, and have 14 and 12 different commits each, respectively. (use "git pull" to merge the remote branch into yours)00:09
I thought git rebase master, from the branch, would merge the branch into the trunk, but maybe it did the opposite?00:10
Yep, that's what it did. So now I need to undo this somehow. :(00:10
thiago what exactly did you run?00:11
← Raedism left00:11
akk git checkout python3-port; git rebase master00:11
and then, after the conflict, git add filename; git git rebase --continue00:11
thiago you rebased on master00:12
you're still diverging from origin/python3-port00:12
master != origin/python3-port00:12
akk But now I'm on python3-port, and when I look at the file, it's the file from master (before the rebase), not the file from python3-port.00:12
thiago because you rebased on master00:12
why should it look like origin/python3-port ?00:12
akk I was under the impression that git rebase master, from the branch, would make master look like the branch.00:13
thiago no, it makes this branch look like master00:13
akk Evidently that's wrong and it's the opposite?00:13
Okay, can I undo that?00:13
thiago git reset --hard to the commit it used to be before you started this work00:13
← Raed|Mobile left00:14
thiago git log -g python3-port will help you00:14
← cdg left00:14
akk I think the reset --hard worked (did it on both master and branch) ... now both of them say they're up to date with origin/*00:16
So what's the right way, if I made a bunch of changes on a branch and now I want to make master look like the branch?00:16
Ideally with all the commits from the branch, but in truth that's not super important.00:16
→ VladGh joined00:18
akk I suppose I could copy all the files from the branch to /tmp, git checkout master, copy them there and commit.00:19
thiago I suppose you shouldn't00:20
→ mizu_no_oto joined00:20
akk It sounds awful, but the howtos I found on how to do this were apparently backward.00:20
← ZyX-I left00:21
akk What's the right way to do it?00:21
← wxg left00:22
→ jeffreylevesque joined00:22
tobiasvl akk: you just want to make master point at another branch?00:23
throw away the current master entirely?00:23
akk Yes, basically. The branch I was working on was for testing, and now that it's tested, I want master to look exactly like it.00:23
→ Solvaring joined00:24
tobiasvl ok, so on master just do a "git reset --hard" to the branch?00:25
with all the caveats that --hard will throw away your changes00:25
but you already used it once before so you are probably aware00:25
akk That'll keep the master's history but then put the branch changes on top?00:26
tobiasvl no00:26
it'll force master to point at the commit that the branch points to00:27
which is what you wanted, right?00:27
it won't keep master's history00:27
akk I could still go back, though, if I wanted to check out the current state of master, or see the list of commits, right?00:28
That's what I mean by history.00:28
→ Lipp joined00:28
→ alyce joined00:28
tobiasvl sorry, when did you mention history?00:29
I'm not clear here on what you want00:29
do you want master to look exactly like the branch or not?00:29
akk I do, but I'd like e.g. git log on master to have everything it has now, plus one or more commits representing the additional work that happened on the branch.00:30
tobiasvl OK, so you do NOT want master to look exactly like the branch00:30
you want master to look like a merge between the branch and master00:30
akk Sorry, I should say, I want the *files* on master to look exactly like the branch.00:30
Not the git log.00:30
tobiasvl oooookay. yes, that's quite different.00:31
"the git log" is the branch.00:31
← Cabanossi left00:31
← j08nY left00:32
← V7 left00:33
→ Cabanossi joined00:33
← noidea left00:33
→ dave0x6d joined00:33
→ Raed|Mobile joined00:33
→ Munt joined00:33
← Lipp left00:34
tobiasvl is there anything weird about the branch? why can't you just merge?00:34
← TikityTik left00:35
tobiasvl or rebase the right way around, since I see that you rebased once already up there but on the wrong branch00:35
isn't that what you want to do, you just mixed up the base?00:35
akk I could probably either merge or rebase, but now I'm afraid to because the commands I got searching the web did the opposite of what I wanted00:36
so I'm not clear which command I need to type from which branch.00:36
← Mattiaslndstrm left00:36
→ Mattiaslndstrm joined00:37
← Murr left00:37
akk So to do this, I want to be on master, and say git rebase branch-name ?00:37
→ Murr joined00:38
akk If I want master to end up with its files looking like the branch?00:38
← aoscott left00:39
→ ArcaTech joined00:40
tobiasvl I don't know what the history of those branches look like or what you want it to end up as, but no, it doesn't sound like it00:40
I assume the branch has branched off of master, but that they have diverged00:41
→ aoscott joined00:41
tobiasvl right? so master has commits the branch doesn't have and vice versa00:41
akk They have diverged a small amount, but actually master has had very little done to it while the branch was being worked on.00:41
→ jeffreylevesque_ joined00:41
akk The only actual conflict was a blank line, AFAICT. Which I think I have now merged into the branch.00:41
tobiasvl I don't understand why a simple "git merge" isn't the solution here00:42
← jeffreylevesque left00:42
← ag4ve left00:42
akk It might be, I just don't know the syntax to do it in the right direction.00:42
→ TikityTik joined00:43
tobiasvl man git merge00:43
gitinfo the git-merge manpage is available at https://gitirc.eu/git-merge.html00:43
tobiasvl in master, "git merge branch_name" will merge in branch_name into master00:43
akk Oh, man git-merge is a lot clearer than man git-rebase.00:43
gitinfo the git-merge manpage is available at https://gitirc.eu/git-merge.html00:43
the git-rebase manpage is available at https://gitirc.eu/git-rebase.html00:43
akk I'd been trying to grok the rebase man page and failing.00:44
That sounds like reason enough to do merge rather than rebase. :)00:44
tobiasvl merging is an extremely common usecase. rebase rewrites history and is really just used when you know you want to rebase00:45
akk git merge branch-name (from master) worked. Thanks, tobiasvl!00:45
tobiasvl make sure the history and working directory look the way you want before you push, I might have misunderstood your situation00:46
pretty much anything can be undone easily until you push00:46
but you should probably read a bit more about git, you seemed to be a bit confused about what branches even are, and overthinking a simple merge00:46
no problem though. good night00:46
akk Thanks again. And I understand branches at the cvs/svn level, but things are so much more complicated in git.00:47
← Garen left00:47
akk And yeah, I need to find time to read Pro Git or similar.00:47
← xaa left00:48
→ Garen joined00:48
→ boombatower joined00:49
→ xaviergmail joined00:50
← leeN left00:50
← ArcaTech left00:50
→ noobineer joined00:51
← noobineer left00:51
← xaviergmail left00:53
← Mattiaslndstrm left00:56
→ xaviergmail joined00:57
→ Mattiaslndstrm joined00:57
→ wxg joined01:00
← xaviergmail left01:02
← elbeardmorez left01:04
→ stutter joined01:05
← nfk left01:07
← converge left01:08
→ cdg joined01:10
→ elbeardmorez joined01:12
→ dreiss joined01:14
← cdg left01:14
→ xaviergmail joined01:15
← damasta left01:17
← cdown left01:21
→ cdown joined01:23
← nahtnam left01:26
← Noldorin left01:27
← akk left01:28
→ hahuang65 joined01:28
→ astrofog joined01:29
→ Lipp joined01:30
← hahuang65 left01:33
→ Sat1re joined01:34
← alyce left01:36
← Mattiaslndstrm left01:37
→ Mattiaslndstrm joined01:37
← xaviergmail left01:42
← basiclaser left01:43
→ xaxxon joined01:43
← Mattiaslndstrm left01:43
→ jottr joined01:46
← dre_ left01:48
→ cqi joined01:49
→ |ifei5g00d joined01:50
← jottr left01:51
← |ifei5g00d left01:51
← Sat1re left01:52
→ |ifei5g00d joined01:52
← matoro left01:53
→ lss8 joined01:57
→ Bobdude joined01:57
→ matoro joined01:57
→ finalbeta joined02:01
← astrofog left02:01
← a3Dman left02:02
→ JanC_ joined02:04
JanC → Guest7403702:05
← Guest74037 left02:05
JanC_ → JanC02:05
→ cdg joined02:10
← d^sh left02:12
→ a3Dman joined02:13
→ d^sh joined02:13
→ czart joined02:14
← cdg left02:15
← Lipp left02:16
← yohnnyjoe left02:16
← czart_ left02:16
← wandering_vagran left02:19
← masuberu left02:19
← mizu_no_oto left02:20
→ ArcaTech joined02:25
← a3Dman left02:25
← felixsanz left02:26
→ felixsanz joined02:27
← Bercik left02:29
← Cabanossi left02:31
→ Cabanossi joined02:33
→ Lyqyd joined02:34
→ a3Dman joined02:34
→ Bercik joined02:34
→ kfoonamalik joined02:35
→ yohnnyjoe joined02:37
← Murr left02:37
→ Murr joined02:38
→ sword joined02:39
← dave0x6d left02:40
← yohnnyjoe left02:41
← bongozig left02:43
→ NightMonkey joined02:47
← dreiss left02:47
← Raed|Mobile left02:48
← ilbot3 left02:50
← SwiftMatt left02:51
← fahadash left02:51
→ dreiss joined02:52
→ matsaman joined02:52
← wxg left02:53
← diogenese left02:56
→ fstd_ joined02:56
← fstd left02:56
fstd_ → fstd02:56
→ ilbot3 joined02:57
→ diogenese joined02:58
← fjasle left03:01
→ fjasle joined03:02
← ArcaTech left03:06
→ duderonomy joined03:06
← Gustavo6046 left03:07
← PioneerAxon left03:09
→ PioneerAxon joined03:10
→ HTTP_____GK1wmSU joined03:11
→ cdg joined03:11
← chachasmooth left03:12
→ wxg joined03:12
← HTTP_____GK1wmSU left03:13
→ chachasmooth joined03:13
→ Lipp joined03:13
← Cabanossi left03:16
← cdg left03:16
← kfoonamalik left03:16
→ lagothri1 joined03:16
→ tmcmahon joined03:17
← spriz left03:18
→ Cabanossi joined03:18
→ beco joined03:19
← lagothrix left03:19
← zulutango left03:21
→ spriz joined03:22
← wootehfoot left03:24
→ zulutango joined03:25
← a3Dman left03:25
→ ankush joined03:26
← d^sh left03:26
→ d^sh joined03:27
← beco left03:28
→ hahuang65 joined03:29
→ a3Dman joined03:32
→ cdg joined03:32
← asphyxia left03:33
→ xaxxon_ joined03:33
← hahuang65 left03:34
← xaxxon left03:34
← ankush left03:35
← cdg left03:37
→ kozy joined03:39
← rewt left03:39
← salamanderrake left03:39
→ rewt joined03:40
→ snowkidind joined03:43
→ jiik joined03:45
→ jottr joined03:47
← wxg left03:47
→ fstd_ joined03:50
← fstd left03:50
fstd_ → fstd03:50
← jottr left03:52
← dreiss left03:56
← Lipp left03:58
→ alyce joined03:59
← pks left04:03
→ pks joined04:05
← tarkus left04:07
← tmcmahon left04:09
← Munt left04:09
→ ArcaTech joined04:12
← ArcaTech left04:13
→ nooooone joined04:15
← Cabanossi left04:16
→ Doginal_ joined04:16
← Doginal left04:17
Doginal_ → Doginal04:17
→ SwiftMatt joined04:18
→ Cabanossi joined04:18
→ asphyxia joined04:19
← matsaman left04:19
→ kfoonamalik joined04:22
← SwiftMatt left04:23
→ whitby_ joined04:24
← kfoonamalik left04:24
← asphyxia left04:24
→ wxg joined04:25
→ Gustavo6046 joined04:25
← whitby left04:26
← alyce left04:30
← snowkidind left04:31
→ QwertyDragon joined04:33
→ cdg joined04:33
← Murr left04:37
→ Murr joined04:38
← cdg left04:38
→ yohnnyjoe joined04:38
→ quamtumslash joined04:39
← quamtumslash left04:39
← yohnnyjoe left04:42
← Cabanossi left04:45
→ Cabanossi joined04:47
← tombusby left04:49
→ tombusby joined04:51
→ s73vm1lls joined04:52
→ jeffreylevesque joined04:53
→ Lipp joined04:55
← jeffreylevesque_ left04:56
← dviola left04:58
← s73vm1lls left05:03
→ s73vm1lls joined05:04
→ Nizumzen joined05:04
← cqi left05:07
kyan So, I've got a file named '/library/.git/modules/Ember satellite projects/modules/personal-private/objects/48/b773754d1b"3ffa44a8c88dbf7889c6d20936a'05:07
What's with that quotation mark in the middle of the sha checksum?05:07
→ bkhl joined05:08
kyan shasum gives 26228700ca57b5bac6a2493f365d2b146a97305d as the sum for the file. Here's some more info (file output, xxd, stat: https://gist.github.com/ethus3h/2f8cb9018d76ad4cd744ac5cac79d912)05:09
→ ChiLL_SurF joined05:12
→ asphyxia joined05:13
kyan Aha, the hash value of the un-zlib-compressed file contents is 48b773754d1b23ffa44a8c88dbf7889c6d20936a, so somewhere or other that 2 got changed to a ". Weird.05:13
→ ArcaTech joined05:13
← QwertyDragon left05:15
kyan Well, I manually just moved the file into place and it seems to be working fine now... I guess this is why servers use error-correcting RAM, heh.05:15
← xaxxon_ left05:16
→ xaxxon joined05:16
→ hanna joined05:17
← s73vm1lls left05:17
← asphyxia left05:18
→ zefferno joined05:18
kyan Aha, it's just a flipped bit, 2 is 00110010 and " is 00100010. Guess there's nothing Git could do about that, really. Sorry for the bother. Thanks :)05:18
← ArcaTech left05:19
← stutter left05:24
← wxg left05:27
← rafasc left05:28
→ hahuang65 joined05:30
← jiik left05:31
→ Raed|Laptop joined05:34
→ cdg joined05:34
← hahuang65 left05:35
→ xaxxon_ joined05:36
→ Chill-Surf joined05:37
← xaxxon left05:37
← ChiLL_SurF left05:38
→ alyce joined05:38
← cdg left05:38
← Chill-Surf left05:39
← Lyqyd left05:39
← Lipp left05:40
← castlelore left05:42
→ shinnya joined05:47
→ jottr joined05:48
→ tarkus joined05:51
← rkta left05:52
→ rkta joined05:52
← jottr left05:53
→ deepakbndeepu joined05:53
→ Gustavo6046_ joined05:56
← murr4y left05:56
← Gustavo6046_ left05:57
→ dre_ joined05:58
← Gustavo6046 left05:59
→ ChiLL_SurF joined05:59
← rkta left06:03
→ rkta joined06:03
← jcarpenter2 left06:05
→ imack joined06:06
← imack left06:06
→ mattheweigand joined06:07
← orbyt_ left06:07
→ uptime joined06:07
→ asphyxia joined06:07
← mattheweigand left06:07
→ imack joined06:08
→ jcarpenter2 joined06:09
→ mattheweigand joined06:09
→ ineku joined06:12
← asphyxia left06:12
← m0viefreak left06:13
← xaxxon_ left06:13
← raynold left06:18
← imack left06:20
→ masuberu joined06:22
→ ArcaTech joined06:25
← kyan left06:28
→ roygbiv joined06:29
→ imack joined06:34
→ cdg joined06:35
→ Zialus joined06:36
← lss8 left06:37
← Murr left06:37
→ Lipp joined06:38
→ Murr joined06:38
→ yohnnyjoe joined06:39
→ castlelore joined06:39
← cdg left06:39
← masuberu left06:40
← SpeakerToMeat left06:40
← yohnnyjoe left06:43
→ SpeakerToMeat joined06:44
← rkta left06:48
→ xaxxon joined06:49
← jcarpenter2 left06:52
→ Chill-Surf joined06:53
→ rkta joined06:53
→ masuberu joined06:53
→ dreiss joined06:54
→ jcarpenter2 joined06:55
← ChiLL_SurF left06:56
← Gurkenglas left07:00
← Chill-Surf left07:01
→ asphyxia joined07:01
← ArcaTech left07:02
→ gtristan joined07:05
← gtristan left07:05
→ gtristan joined07:06
← roygbiv left07:06
← asphyxia left07:06
→ quamtumslash joined07:07
← dreiss left07:11
← rkta left07:13
→ Gurkenglas joined07:13
← Raed|Laptop left07:14
← ineku left07:16
→ rkta joined07:19
← a3Dman left07:19
← masuberu left07:21
← Lipp left07:22
→ Raed|Laptop joined07:23
→ ttl joined07:26
→ a3Dman joined07:26
← rkta left07:28
← imack left07:30
← quamtumslash left07:31
→ hahuang65 joined07:31
← a3Dman left07:32
→ quamtumslash joined07:32
→ rkta joined07:34
← deepakbndeepu left07:35
→ cdg joined07:35
← hahuang65 left07:36
← rkta left07:39
← cdg left07:40
→ a3Dman joined07:40
← quamtumslash left07:41
→ quamtumslash joined07:43
_ikke_ wow, never noticed such bit-flips before07:44
← ergZay left07:44
→ rkta joined07:45
← quamtumslash left07:46
→ ergZay joined07:46
→ lss8 joined07:46
→ jottr joined07:48
→ Lipp joined07:52
← jottr left07:53
← rkta left07:53
→ rkta joined07:54
→ asphyxia joined07:55
← PioneerAxon left07:55
→ PioneerAxon joined07:56
→ King_Hual joined07:57
→ HTTP_____GK1wmSU joined07:59
← asphyxia left08:00
← HTTP_____GK1wmSU left08:02
→ tkore joined08:02
← tkore left08:02
→ tkore joined08:02
← Raed|Laptop left08:11
← ntnn left08:12
← rkta left08:15
→ rkta joined08:16
→ ntnn joined08:17
← rkta left08:25
→ rkta joined08:25
→ SteffanW joined08:28
→ jnavila joined08:31
→ ChiLL_SurF joined08:31
→ masuberu joined08:35
→ dersand joined08:35
→ Murii|osx joined08:35
← watabou left08:36
→ cdg joined08:36
→ cqi joined08:37
← Lipp left08:37
→ opalepatrick joined08:38
← boombatower left08:39
→ yohnnyjoe joined08:40
← cdg left08:41
→ imack joined08:41
← yohnnyjoe left08:44
→ murr4y joined08:46
→ jottr joined08:47
→ asphyxia joined08:49
← rkta left08:51
← xaxxon left08:52
→ rkta joined08:52
→ Raed|Laptop joined08:53
→ tkore\ joined08:54
→ raynold joined08:54
← jnavila left08:55
→ fatihgenc joined08:56
← Raed|Laptop left08:58
→ jnavila joined08:59
← asphyxia left09:00
← rkta left09:02
→ sea-gull joined09:06
→ rkta joined09:08
→ overlord_tm joined09:08
→ robotroll joined09:11
→ valtih2 joined09:12
← robotroll left09:13
← Cabanossi left09:14
← overlord_tm left09:15
← cqi left09:15
← thiago left09:16
→ overlord_tm joined09:16
← SteffanW left09:16
→ pbandark joined09:17
→ Cabanossi joined09:17
← rkta left09:22
→ indistylo joined09:27
→ rkta joined09:28
→ karelk joined09:29
→ nd joined09:30
→ hahuang65 joined09:32
→ db8093246 joined09:32
← nd_ left09:33
← energizer left09:34
→ Lipp joined09:34
← hahuang65 left09:36
← jnavila left09:37
→ jnavila joined09:37
→ cdg joined09:37
← rkta left09:38
→ rkta joined09:38
← sea-gull left09:39
→ Fernando-Basso joined09:40
← cdg left09:41
→ catsup joined09:41
← catsup left09:42
→ catsup joined09:42
→ nahtnam joined09:43
← rkta left09:48
→ asphyxia joined09:49
→ ShekharReddy joined09:49
← asphyxia left09:54
→ Cassiopaya joined09:54
→ thomasross_ joined10:01
← Nizumzen left10:01
→ lordjancso joined10:02
← thomasross left10:03
→ JJjack joined10:04
→ tmm88 joined10:06
← tmm88 left10:06
→ tmm88 joined10:06
← Solvaring left10:07
→ Nizumzen joined10:07
→ Darcidride joined10:08
→ salamanderrake joined10:08
← robattila256 left10:09
→ jiik joined10:10
→ ase_123123 joined10:11
→ asphyxia joined10:11
← Darcidride left10:12
→ xaa joined10:18
→ muelleme joined10:18
← Lipp left10:19
JJjack I commitd my changes but after git stash apply I still get merge confilct10:25
CONFLICT (content): Merge conflict in10:26
→ JJjack_ joined10:26
→ whyme joined10:26
JJjack_ how do I get rid of it10:28
does git reset hard remove the stashes?10:28
← alyce left10:28
→ exotime joined10:29
← asphyxia left10:29
← JJjack left10:30
JJjack_ → JJjack10:30
← Cabanossi left10:31
← ase_123123 left10:31
→ Cabanossi joined10:32
← valtih2 left10:32
→ ZyX-I joined10:35
→ alyce joined10:36
← karelk left10:37
→ cdg joined10:38
→ yohnnyjoe joined10:40
→ diqidoq joined10:41
→ re1 joined10:42
← cdg left10:42
← alyce left10:43
← TikityTik left10:44
← yohnnyjoe left10:45
← JJjack left10:45
→ doener joined10:46
nocbreak no10:50
just don't stash apply if you don't want the stash10:50
nocbreak → cbreak10:51
→ mikecmpbll joined10:52
→ neel joined10:53
← gtristan left10:53
→ jameser joined10:55
← safe left10:57
→ theoceaniscool_ joined10:58
← jameser left10:59
← SpeakerToMeat left11:01
→ beccamorgan joined11:03
→ paul424 joined11:06
← nooooone left11:08
→ phluks joined11:10
→ user_corrupt joined11:13
← user_corrupt left11:13
→ user_corrupt joined11:13
user_corrupt hi all11:13
← in1t3r left11:13
user_corrupt I've got a folder on my desktop with a project I'm working on11:14
how do I turn it into a git repo?11:14
jast 'git init' at the root of the project11:14
→ wxg joined11:15
jast you may want to read a tutorial, they generally cover this kind of thing :)11:15
man gittutorial11:15
gitinfo the gittutorial manpage is available at https://gitirc.eu/gittutorial.html11:15
← overlord_tm left11:15
← Cabanossi left11:15
← jcbitter left11:16
→ Cabanossi joined11:17
→ JJjack joined11:19
user_corrupt jast: yeah.. I just remember having a really hard time with this in the past for some reason... I've done that command in the folder, and it says that it has initiated an empty git repository there... does that look right?11:20
← whyme left11:20
→ robattila256 joined11:20
→ Tobbi joined11:20
← neel left11:20
jast user_corrupt: yeah. now you can start adding/commiting things11:20
parsnip the commit graph starts out empty11:21
jast if you're planning on pushing your commits somewhere, there'll be extra steps for adding the remote repository URL and setting up branch tracking11:21
parsnip flees11:21
→ whyme joined11:21
← wxg left11:21
user_corrupt I'm used to pushing everything to gitlab at work...11:22
do you guys recommend setting up a repository on github, or can I just use localhost somehow11:23
?11:23
jast you don't need a remote repo at all, all of your history is saved inside your project root (the .git subdir)11:24
pushing to somewhere else makes sense if you want to backup/share/collaborate mainly11:24
dminuoso Of course git does not replace a backup tool.11:24
!backup11:24
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups11:24
dminuoso Mmm, not what I was hoping for.11:24
jast there's always space for more bot triggers ;)11:24
← whyme left11:25
← imack left11:26
parsnip until someone sticks a binary in there11:26
→ whyme joined11:27
→ Lipp joined11:28
← uptime left11:29
→ j08nY joined11:30
user_corrupt ok, groovy11:31
so I can just start making a new branch locally and committing things to it11:31
and I don't need to push at any point?11:32
→ hahuang65 joined11:33
← whyme left11:33
← lordjancso left11:34
→ whyme joined11:35
dminuoso user_corrupt: git is decentralized, `push` does not "store it on a main server"11:35
user_corrupt thanks for trying to elucidate, but I fail to see how I was implying that it does11:37
I'm just trying to make sure that I'm not missing any steps here11:37
← phluks left11:37
dminuoso user_corrupt: What makes you think you "have to push" ?11:37
← zulutango left11:38
user_corrupt I'm just used to pushing committed changes to gitlab at work11:38
← hahuang65 left11:38
jast user_corrupt: exactly, no need to push if having everything locally is enough11:38
dminuoso user_corrupt: Your local repository is a full and proper git repository.11:38
user_corrupt: Thats what I meant with 'git is decentralized'.11:38
→ jameser joined11:38
dminuoso user_corrupt: the repository you are used to at gitlab is not 'more' or 'better'. In fact its likely even 'less'.11:38
parsnip _and_, you pick which branches you share! :)11:39
→ cdg joined11:39
parsnip less?11:39
user_corrupt ok, so I make some changes to new branch, commit them, and then I can switch back to master and not worry about losing anything? No stash required?11:39
jast parsnip: the disk space costs you less ;)11:39
user_corrupt: sure11:39
dminuoso user_corrupt: correct.11:39
→ marshmallow joined11:40
user_corrupt okey doke, cool11:40
dminuoso user_corrupt: the only difference between what you see on gitlab and locally, is that gitlab happens to have an elaborate graphical web frontend11:40
with some bells and whistles11:40
→ ankush joined11:40
user_corrupt I guess I just failed to realise that committing is the part that actually saves things locally11:40
→ imack joined11:40
jast yeah, in the background on their server you have pretty much the same thing as in your local git repo11:40
dminuoso but basically when you "create a repository" at gitlab, you can think it just runs some "git init --bare" script. :)11:41
jast right. it's a bit different if your experience is more with centralized systems like svn11:41
parsnip `git status` and `git log --oneline --graph --all` should give an idea of the state.11:41
← imack left11:41
→ imack joined11:42
← Gurkenglas left11:43
→ Gurkenglas joined11:43
← cdg left11:43
← YuGiOhJCJ left11:44
← koell left11:44
dminuoso user_corrupt: together with reflog (its something like macOS timemachine if you want), it's very hard to lose work in your git repository11:44
I mean it takes real effort.11:44
jast rm -rf is actually pretty easy ;)11:45
← ttl left11:45
dminuoso Fun fact, until not too long ago something like `rm -rf /` had the possibility of bricking your hardware.11:45
_ikke_ due to efifs11:46
or how it's called11:46
dminuoso Yeah11:46
UEFI11:46
_ikke_ the file system mount I mean11:46
efivarfs11:46
dminuoso Ah yeah11:46
→ Chill-Surf joined11:52
← Chill-Surf left11:52
→ Chill-Surf joined11:53
← Chill-Surf left11:53
← ChiLL_SurF left11:55
← leah2 left11:56
→ manuelschneid3r joined11:59
→ leah2 joined11:59
← marshmallow left12:00
← jameser left12:01
→ oprypin joined12:04
← a3Dman left12:04
← JJjack left12:04
→ converge joined12:09
→ jceb joined12:12
← Lipp left12:13
← paul424 left12:15
← peepsalot left12:16
→ wxg joined12:17
→ cdg joined12:19
← diqidoq left12:19
→ ToBeFree joined12:20
← ToBeFree left12:20
→ ToBeFree joined12:20
→ ChiLL_SurF joined12:20
← ToBeFree left12:21
→ alyce joined12:22
← ChiLL_SurF left12:23
→ ChiLL_SurF joined12:23
← cdg left12:24
Seveas dminuoso: oh, that bug wass fixed?12:24
dminuoso Seveas: Yeah, it didnt actually take long when it was discovered.12:25
And technically it wasnt really a bug either.12:25
→ jeffreylevesque_ joined12:26
← jeffreylevesque left12:28
→ dave0x6d joined12:28
← Fernando-Basso left12:29
→ peepsalot joined12:29
→ HTTP_____GK1wmSU joined12:29
→ diqidoq joined12:30
→ skinkitten joined12:31
← HTTP_____GK1wmSU left12:32
← ahrs left12:34
← dre_ left12:35
→ ahrs joined12:35
← Murr left12:37
→ Murr joined12:37
→ koell joined12:38
← koell left12:38
← nahtnam left12:39
→ Raed|Mobile joined12:39
→ yohnnyjoe joined12:41
← yohnnyjoe left12:46
← Cabanossi left12:46
→ Cabanossi joined12:47
_ikke_ What was the fix?12:47
→ cdg joined12:48
← imack left12:48
← duderonomy left12:49
← diqidoq left12:50
→ mentalita joined12:51
← cdg left12:52
← jottr left12:53
→ duderonomy joined12:57
→ diqidoq joined13:01
dminuoso _ikke_: entries were turned immutable by default13:02
→ leeN joined13:02
→ karelk joined13:04
dminuoso https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0389075ecfb6231818de9b0225d3a5a21a66117113:04
_ikke_ dminuoso: thanks13:05
← TSS_ left13:05
→ Noldorin joined13:06
← Gurkenglas left13:09
→ Lipp joined13:10
→ TSS_ joined13:11
→ m0viefreak joined13:14
← alyce left13:14
← muelleme left13:17
← wxg left13:18
← j08nY left13:19
← re1 left13:20
← jcarpenter2 left13:25
→ jcarpenter2 joined13:25
← Tobbi left13:26
→ jottr joined13:28
→ basiclaser joined13:28
← atomi left13:29
← indistylo left13:29
→ Gurkenglas joined13:30
→ bergice_ joined13:32
← rtjure left13:33
→ hahuang65 joined13:34
→ HTTP_____GK1wmSU joined13:36
← HTTP_____GK1wmSU left13:38
← hahuang65 left13:38
→ troulouliou_div2 joined13:38
← jceb left13:42
← troulouliou_div2 left13:47
← tmm88 left13:48
→ atomi joined13:48
→ cdg joined13:49
→ Raedism joined13:49
→ wxg joined13:50
→ quamtumslash joined13:51
← Raed|Mobile left13:52
← Lipp left13:52
→ rominronin joined13:52
← raynold left13:53
← cdg left13:53
← Raedism left13:53
→ indistylo joined13:58
→ Raed|Mobile joined13:59
→ nooooone joined13:59
→ troulouliou_div2 joined13:59
→ danielglh joined14:00
← nooooone left14:00
→ nooooone joined14:01
← Raed|Mobile left14:01
← fatihgenc left14:02
← nooooone left14:02
→ nooooone joined14:02
→ fatihgenc joined14:03
→ mar77i joined14:04
→ Raed|Mobile joined14:04
← clickjack left14:06
→ griffindy joined14:07
→ clickjack joined14:07
→ SpeakerToMeat joined14:08
→ noidea joined14:08
← noidea left14:09
→ Tobbi joined14:09
→ overlord_tm joined14:11
→ Karazhan joined14:12
→ muelleme joined14:13
← griffindy left14:13
← Karazhan left14:18
→ Karazhan joined14:18
← muelleme left14:19
→ nooooone_ joined14:20
→ dsdeiz joined14:20
→ njbair joined14:21
→ hexa- joined14:21
← sarri left14:21
← nooooone left14:23
→ Guest61260 joined14:23
← overlord_tm left14:24
← theoceaniscool_ left14:25
← wxg left14:30
← Cabanossi left14:31
→ yohnnyjoe joined14:31
→ Cabanossi joined14:32
→ wxg joined14:34
← jnavila left14:35
← dsdeiz left14:35
← tarkus left14:36
→ jnavila joined14:36
← Murr left14:37
→ Murr joined14:38
→ rominron_ joined14:40
← mentalita left14:41
→ snowkidind joined14:42
← rominronin left14:42
→ fxb joined14:43
← danielglh left14:44
→ robotroll joined14:44
→ DaGoaty joined14:45
← Raed|Mobile left14:48
→ cdg joined14:49
← quamtumslash left14:50
→ Lipp joined14:50
→ Gustavo6046 joined14:52
← DaGoaty left14:52
← Guest61260 left14:52
→ DaGoaty joined14:52
← DaGoaty left14:53
→ DaGoaty joined14:53
← masuberu left14:54
← cdg left14:54
→ mentalita joined14:54
← troulouliou_div2 left14:55
← opalepatrick left14:56
← Tobbi left14:56
→ opalepatrick joined14:56
→ mellernoia joined14:57
→ xiongmao86 joined14:59
← jottr left15:01
converge my branch is outdated, and I need update it. can I do a rebase in this case ?15:01
dminuoso converge: Yes. Just `git fetch origin`, `git rebase origin/branch`15:02
→ theoceaniscool_ joined15:03
→ in1t3r joined15:07
→ satifant joined15:07
← tkore left15:09
← shinnya left15:09
→ rkta joined15:12
→ overlord_tm joined15:14
← user_corrupt left15:15
→ asphyxia joined15:15
← diqidoq left15:15
→ hanneso joined15:15
← zefferno left15:18
→ Raed|Mobile joined15:18
← Garen left15:18
→ Garen joined15:19
→ Argylelabcoat joined15:20
← overlord_tm left15:23
← theoceaniscool_ left15:23
→ dviola joined15:24
→ phluks joined15:24
← guideline_ left15:26
← asphyxia left15:29
← Oatmeal left15:30
← jiik left15:31
← Lipp left15:32
← opalepatrick left15:33
← ali1234 left15:34
→ theoceaniscool_ joined15:34
converge dminuoso: I did git fetch upstream and git rebase upstream/blacklist_feature , but it shows15:34
fatal: Needed a single revision15:34
_ikke_ converge: that means git does not know what upstream/blacklist_feature is15:34
→ danielglh joined15:34
→ hahuang65 joined15:34
_ikke_ converge: did you check with git branch -r?15:35
converge _ikke_: blacklist_feature is my fork/local branch15:36
I think I need just "git rebase upstream"15:37
← wxg left15:37
→ Tobbi joined15:38
← theoceaniscool_ left15:39
converge or git rebase blacklist_feature ?15:39
← hahuang65 left15:39
→ cdg joined15:42
→ wxg joined15:43
← mda1 left15:45
→ tlaxkit joined15:46
→ SkyPatrol joined15:47
→ Raed|Laptop joined15:47
→ bauruine joined15:48
→ ali1234 joined15:48
converge git fech my_branch ; git pull --rebase upstream master did the work15:50
→ liori joined15:54
← DaGoaty left15:55
→ DaGoaty joined15:56
→ tarkus joined15:56
← DaGoaty left15:56
→ DaGoaty joined15:57
← Khisanth left16:02
→ Oatmeal joined16:05
→ rtjure joined16:08
← ojdo left16:10
← danielglh left16:13
→ orbyt_ joined16:13
→ danielglh joined16:14
← bauruine left16:15
→ Khisanth joined16:16
→ bauruine joined16:17
→ dreiss joined16:17
→ dege joined16:17
→ ojdo joined16:17
← danielglh left16:18
← Raed|Laptop left16:18
→ guideline joined16:19
→ danielglh joined16:19
← Raed|Mobile left16:19
→ StevenHedberg joined16:19
StevenHedberg is it possible to change a commit in history with rebase; not a commit message, but the actual commit16:20
← wxg left16:21
← danielglh left16:22
→ danielglh joined16:22
← drodger left16:23
→ re1 joined16:23
← danielglh left16:23
→ danielglh joined16:23
→ dsdeiz joined16:26
← dsdeiz left16:26
→ dsdeiz joined16:26
→ YuGiOhJCJ joined16:26
← Gurkenglas left16:27
→ wxg joined16:27
← StevenHedberg left16:27
← chachasmooth left16:28
→ chachasmooth joined16:28
← ankush left16:28
→ diqidoq joined16:28
← peepsalot left16:28
→ drodger joined16:29
← re1 left16:29
→ Gurkenglas joined16:30
← Cabanossi left16:30
← YuGiOhJCJ left16:31
→ YuGiOhJCJ joined16:32
→ Cabanossi joined16:32
← whyme left16:34
→ wootehfoot joined16:34
← cdg left16:37
← diogenese left16:37
← Murr left16:37
← dsdeiz left16:38
→ Murr joined16:38
→ thiago joined16:38
_ikke_ sure16:38
→ cdg joined16:38
→ diogenese joined16:40
← cdg left16:41
→ cdg joined16:41
→ peepsalot joined16:44
← nooooone_ left16:45
← cdg left16:46
← DaGoaty left16:48
→ whyme joined16:48
→ DaGoaty joined16:48
→ cdg joined16:49
← cdg left16:51
← cdown left16:52
← peepsalot left16:52
→ cdown joined16:52
← DaGoaty left16:53
Hello71 too bad they'll never learn how16:56
← dreiss left16:56
_ikke_ Oh, didn't notice they were already gone16:57
→ jottr joined16:57
→ cdg joined16:57
← wxg left16:58
← cdg left16:59
→ cdg joined16:59
→ wxg joined16:59
→ rorro joined17:00
→ gtristan joined17:00
→ |ifei5good joined17:01
← wxg left17:01
← jottr left17:02
→ King_Hual` joined17:02
← phluks left17:02
converge _ikke_: I created a pull request at github and its a little messy after trying to rebase(my bad), do you know how could I fix it ? this is the PR https://github.com/timgrossmann/InstaPy/pull/812 , and what I really would like to PR is this one https://github.com/timgrossmann/InstaPy/compare/master...converge:blacklist_feature?expand=117:02
← |ifei5g00d left17:02
→ DaGoaty joined17:03
← rorro left17:04
← King_Hual left17:05
→ kfoonamalik joined17:05
→ HTTP_____GK1wmSU joined17:05
← HTTP_____GK1wmSU left17:06
→ peepsalot joined17:07
← orbyt_ left17:07
→ d-fence joined17:10
_ikke_ converge: can you give your !situation?17:11
gitinfo converge: Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)17:11
← Tobbi left17:11
← ShekharReddy left17:11
converge _ikke_: https://gist.github.com/converge/b5a01bca71b60135675d7e3bab99e45a17:14
→ opalepatrick joined17:14
← opalepatrick left17:15
← tarkus left17:15
_ikke_ converge: So you merged origin/blacklist_feature into your local branch, right? (through git pull)17:16
→ Tobbi joined17:16
Isla_de_Muerte → NwS17:16
→ jstein_ joined17:17
jstein_ → jstein17:17
→ watabou joined17:17
converge _ikke_: exactly17:17
local branch = master (fork)17:17
_ikke_ So that merge already made your branch up-to-date, not?17:19
→ kusfedora joined17:20
converge _ikke_: I updated my blacklist_feature branch doing git fetch / git pull --rebase upstream master17:20
→ |ifei5g00d joined17:21
kusfedora so... I've used git for six or seven years but I still don't do anything other than very basic things and the whole thing still confuses me. so here is a clean slate with a NEW username and a NEW project github dot com slash mcny slash myfirstproject well the question is all these services have "wiki" and issue tracker and what not but these things are not a part of my git repo are they?17:22
_ikke_ converge: So what do you want to achieve right now?17:22
→ matsaman joined17:23
← |ifei5good left17:23
_ikke_ kusfedora: correct17:24
converge _ikke_: what confuses me is that before this last pull request update I had a clean pull requests, with only 2 commits, and it was all clean. now my pull requests has 18 commits (I did 4 in my branch). is it ok ?17:24
_ikke_ kusfedora: These are github specific things17:24
converge kusfedora: this is an awesome place to understand git better https://learngitbranching.js.org/17:24
kusfedora thanks17:26
_ikke_ converge: No, this is most likely not what you want17:27
→ Raging_Hog joined17:27
kusfedora they made a game out of it :D17:28
← |ifei5g00d left17:31
→ Mattiaslndstrm joined17:31
converge _ikke_: is there a fix for it ?17:31
→ |ifei5g00d joined17:31
_ikke_ converge: let me take a deeper look17:31
→ menip joined17:33
← menip left17:33
← thinkpad left17:33
→ ankush joined17:33
← robotroll left17:34
→ dsdeiz joined17:34
← dsdeiz left17:34
→ dsdeiz joined17:34
→ hahuang65 joined17:35
converge _ikke_: its ok, I'll just take extra care to merge it17:35
_ikke_ converge: So you pull request consists of 6 commits?17:36
your*17:36
converge: I can help you, hold on17:36
converge _ikke_: thanks! yes, 6 commits at total17:37
_ikke_ Ok. I would first undo the last merge you did (the pull)17:37
Do you have any uncomitted changes?17:37
converge _ikke_: no, it's all commited17:38
_ikke_ git reset --hard HEAD~117:38
← Cassiopaya left17:39
→ bongozig joined17:39
converge _ikke_: nice, Im here now a710e8b6ec80b011d918f4809da3697172d96e5d / add blacklist to comments feature17:40
_ikke_ now: git rebase --onto origin/blacklist_feature ed8623b17:41
converge done17:42
_ikke_ can you show the situation again?17:43
converge sure, 1sec17:43
_ikke_: https://gist.github.com/converge/701ebd5f6dcf61e069282ae395bb470717:45
_ikke_ Nothing changed...17:46
The same merge is still there17:46
converge _ikke_: its ok, I'll just merge it carefully , anyway, thank you very much17:47
← dsdeiz left17:48
→ tkore joined17:50
← tkore\ left17:52
→ rafasc joined17:52
→ eroux joined17:52
→ jason237 joined17:53
← jnavila left17:55
→ jnavila_ joined17:55
→ a3Dman joined17:55
→ muelleme joined17:56
→ nisseni joined17:56
← converge left17:58
← a3Dman left18:00
→ koell joined18:01
← pks left18:02
← nisseni left18:02
→ pks joined18:03
→ nisseni joined18:03
→ xaviergmail joined18:06
← Orphis left18:07
← dfee1 left18:09
→ peterbecich joined18:09
→ opalepatrick joined18:12
← opalepatrick left18:12
→ tarkus joined18:13
← nisseni left18:14
← mellernoia left18:14
→ Orphis joined18:15
→ opalepatrick joined18:18
→ forestbits joined18:18
← rigid left18:20
forestbits Workflow question: I understand the benefit of commits for an existing project - say, to fix a bug or add a tiny feature - but I don't really know what to commit at the beginning of a project, when everything is still in flux. Best practices?18:21
← opalepatrick left18:21
← peterbecich left18:21
mud forestbits: Pretty much the same concept really. Every thing you fix a bug or add a feature or set up something or have a discrete amount of work you can give a description to.18:22
→ a3Dman joined18:22
thiago think of it after everything is done and you want to figure out *why* something was done the way it was18:23
→ TikityTik joined18:23
thiago structure your commits so you can find that out18:23
nedbat forestbits: any time you switch from one thing to another, make a commit.18:24
→ peterbecich joined18:24
nedbat thing == task, chore, idea, whatever18:24
→ rigid joined18:24
← rigid left18:24
→ rigid joined18:24
forestbits What if you aren't working on a single thing at a time? I know it is bad practice at a larger scale, but I don't know how to avoid it at a smaller scale.18:26
← Mattiaslndstrm left18:27
← whyme left18:29
bremner you can still make sensible commits18:29
just never ever use git commit -a18:29
← peterbecich left18:32
mud You can always tell git whatever story you want. Just make it a sensical one if you want to be kind to your future self.18:32
← cdg left18:33
← forestbits left18:35
bremner !next18:36
gitinfo Another satisfied customer. NEXT!18:36
← YuGiOhJCJ left18:37
← Murr left18:37
→ Murr joined18:38
← ankush left18:38
→ jceb joined18:39
← kfoonamalik left18:39
→ safe joined18:40
→ energizer joined18:40
→ raynold joined18:40
← matsaman left18:41
→ Lyqyd joined18:42
← bauruine left18:44
← db8093246 left18:45
← Cabanossi left18:45
← DaGoaty left18:46
→ Cabanossi joined18:47
→ bauruine joined18:47
→ DaGoaty joined18:47
← govg left18:48
→ db8093246 joined18:49
← DaGoaty left18:51
→ shinnya joined18:52
→ peterbecich joined18:56
→ ankush joined18:58
→ jottr joined18:58
→ troulouliou_dev joined18:59
← troulouliou_dev left19:00
→ erf joined19:00
→ Anja_ joined19:00
→ AlisaLisa joined19:03
← jottr left19:03
← hahuang65 left19:07
→ robotroll joined19:08
→ oojacoboo joined19:09
→ adgtl joined19:11
← adgtl left19:11
→ adgtl joined19:11
← AlisaLisa left19:11
← shinnya left19:11
← SkyPatrol left19:12
← adgtl left19:12
← erf left19:13
→ adgtl- joined19:13
← adgtl- left19:13
→ adgtl- joined19:13
→ clickjac_ joined19:14
← in1t3r left19:14
→ SkyPatrol joined19:16
← mooasaurus left19:16
← Lyqyd left19:16
→ mooasaurus joined19:17
← clickjack left19:17
← xiongmao86 left19:17
→ ArcaTech joined19:17
→ converge joined19:20
← robotroll left19:23
← peterbecich left19:30
← Nizumzen left19:34
← ski4x7 left19:34
← PaulCape_ left19:35
→ PaulCapestany joined19:36
← jeffreylevesque_ left19:38
adgtl- → adgtl19:39
→ orbyt_ joined19:41
→ royal_screwup21 joined19:43
← muelleme left19:43
royal_screwup21 so there's a github repo that has uses a library. I know how to fix it. But nobody so far has raised an issue for it. Should I open up an issue? Or should I submit a pull request?19:44
a deprecated** library19:44
_ikke_ royal_screwup21: pull request works best in most cases19:45
royal_screwup21 ah cool! I was under the impression that you could submit pull requests only if an issue was raised...19:45
mud Nope, they can be unrelated. If there exists an issue (or issues) you solve, it's usually a good idea to reference them in the pull request though.19:46
Hello71 !github19:46
gitinfo Note that github != git. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)19:46
royal_screwup21 Okay, so I looked up how to submit a pull request. From what I understood: I need to fork the repo, create a branch on the forked repo, make my changes in the branch, then submit the forked repo as a pull request. Am I on the right track?19:48
_ikke_ yes, that's correct19:48
→ Mattiaslndstrm joined19:48
_ikke_ you create a pull request from the branch you pushed to your forked repo19:49
royal_screwup21 ...is there an easier way? Seems like a lot of work for just one minor change19:49
_ikke_ forking is just one button press19:49
thiago royal_screwup21: more importantly, this is a project-specific question19:49
we can't tell you if that project wants issues reported for each pull request19:49
_ikke_ Usually there is a contributors19:49
→ jungsubk joined19:50
thiago file?19:50
_ikke_ yeah19:51
→ |ifei5good joined19:52
→ willingc joined19:53
← |ifei5g00d left19:54
← willingc left19:54
← watabou left19:54
→ peterbecich joined19:54
→ troulouliou_dev joined19:55
← rewt left19:57
← ArcaTech left19:57
→ rewt joined19:58
← Mattiaslndstrm left19:58
→ cur8or joined20:00
← a3Dman left20:02
→ ski7777 joined20:03
→ hahuang65 joined20:03
→ a3Dman joined20:05
→ belmoussaoui_ joined20:05
← Hink left20:06
← fatihgenc left20:06
← converge left20:07
→ nisseni joined20:08
← hahuang65 left20:08
← BenderRodriguez left20:08
→ texinwien joined20:10
← troulouliou_dev left20:10
→ Hink joined20:10
← Hink left20:10
← Hello71 left20:11
← peterbecich left20:12
→ Hink joined20:12
→ Isla_de_Muerte joined20:13
→ freakyyy joined20:14
→ Es0teric joined20:15
→ dsdeiz joined20:15
← dsdeiz left20:15
→ dsdeiz joined20:15
← NwS left20:15
ali1234 royal_screwup21: there is in fact a much easier way. you can go to github.com, log in, and then find the file with the bug and click on the pencil icon and make the fix right in the browser. once you're done it will automatically create a pull request for you.20:16
royal_screwup21 with refards to my previous question: is it necessary to make a branch on the forked repo?20:16
← freakyyy left20:16
ali1234 however, project maintainers seem to absolutely HATE it when you do this20:16
royal_screwup21 oh20:16
→ freakyy joined20:16
royal_screwup21 well I've already forked it and done everything20:16
ali1234 you don't have to make a new branch on your fork, but it helps keep things tidy20:17
→ Mattiaslndstrm joined20:18
royal_screwup21 how do I view the exact specific changes I've made to a repo? git log shows me all the commits, but how do I view the changes the stuff for a specific commit?20:18
_ikke_ royal_screwup21: git show <commit>20:18
→ Hello71 joined20:19
← dsdeiz left20:19
→ EXAAOGWE joined20:19
→ koro joined20:19
← belmoussaoui_ left20:20
← cur8or left20:20
koro hi. To ignore a specific file type (e.g. pdf) only in the main repo dir but not in the subdirs, is it correct to add ./*.pdf to the gitignore file?20:20
ali1234 i think it should be /*.pdf20:21
koro wouldn't that match even in subdirs?20:21
ali1234 no, that would be *.pdf (i think)20:21
thiago correct20:21
/*.prf only matches in the current dir20:22
→ in1t3r joined20:23
← koell left20:23
← db8093246 left20:24
← nisseni left20:24
→ Hello71_ joined20:24
→ saganbyte joined20:25
koro ah, thanks20:25
→ nast joined20:26
→ NwS joined20:26
koro just to understand this... "*.pdf" will match any .pdf file anywhere", right? I'm trying to understand the matching rules but it's a bit confusing20:26
← rishi left20:26
koro if i understood the docs correctly, writing "foo" will only match foo in the base dir, correct?20:27
← rominron_ left20:27
← Hello71 left20:27
→ ag4ve joined20:27
→ cur8or joined20:27
← Isla_de_Muerte left20:28
← Raging_Hog left20:28
→ ArcaTech joined20:28
saganbyte Hello folks, I have a local branch called abc which was created with upstream/abc as its remote tracking branch. I also have a origin/abc. Now I want to make upstream/develop the remote tracking branch and have the changes pushed to origin/abc. So far I did `git branch --set-upstream-to=upstream/develop`. Now when I try `git push -u origin abc` I m greeted with `error: failed to push some refs `20:28
Do i need to do `git push -f origin abc` for a PR i have from origin/abc to upstream/develop?20:29
← Hello71_ left20:29
→ troulouliou_dev joined20:29
← Mattiaslndstrm left20:30
_ikke_ koro: No, foo will match 'foo' anywhere20:32
saganbyte: You need to push -f if the other remote does have changes you do not have locally or the changes have been rewritten20:33
saganbyte: well, in the first case, -f is not the best optiom20:33
option20:33
→ peterbecich joined20:33
→ Hello71 joined20:33
→ svm_invictvs joined20:34
koro oh. that's good to know. thanks.20:34
← koro left20:34
← cdown left20:34
saganbyte Thanks _ikke_20:35
← troulouliou_dev left20:35
← tlaxkit left20:36
→ dfee1 joined20:36
← jceb left20:39
→ troulouliou_dev joined20:39
→ Isla_de_Muerte joined20:39
← marlinc left20:41
→ Mattiaslndstrm joined20:42
→ enkrypt joined20:43
← NwS left20:43
→ gugah joined20:45
← svm_invictvs left20:47
← eroux left20:49
→ gargola_ joined20:51
← dfee1 left20:53
← gargola left20:53
← luckman212 left20:53
→ NwS joined20:56
← a3Dman left20:57
→ cdown joined20:57
← Isla_de_Muerte left20:58
→ luckman212 joined20:59
→ jottr joined20:59
→ overlord_tm joined21:00
→ a3Dman joined21:01
← ankush left21:01
← hanneso left21:01
→ hanneso joined21:02
← snowkidind left21:03
← Murii|osx left21:03
← ArcaTech left21:04
← jottr left21:05
→ snowkidind joined21:05
→ svm_invictvs joined21:05
→ ArcaTech joined21:06
← gargola_ left21:08
→ j08nY joined21:11
← tarkus left21:11
← |ifei5good left21:12
→ bezhermoso joined21:12
→ |ifei5g00d joined21:13
→ jottr joined21:13
← |ifei5g00d left21:13
← saganbyte left21:14
← bezhermoso left21:15
→ bezhermoso joined21:15
← thiago left21:15
→ cur8or_ joined21:15
→ |ifei5g00d joined21:15
← cur8or left21:18
← |ifei5g00d left21:18
→ Disgeae joined21:19
→ |ifei5g00d joined21:19
→ thiago joined21:19
← orbyt_ left21:19
← peterbecich left21:19
← bezhermoso left21:19
→ bezhermoso joined21:21
→ askb joined21:24
← King_Hual` left21:26
← jungsubk left21:26
→ Bhootrk_ joined21:28
← Bhootrk_ left21:28
→ Bhootrk_ joined21:28
← Bhootrk_ left21:28
← snowkidind left21:29
← cdown left21:29
jnavila_ → jnavila21:29
→ watabou joined21:30
→ dreiss joined21:30
← ArcaTech left21:31
← leeN left21:33
→ theoceaniscool_ joined21:33
← drodger left21:33
→ Hu0p joined21:34
→ orbyt_ joined21:35
→ cdg joined21:35
→ drodger joined21:35
→ Feral_Cat joined21:37
← dreiss left21:38
← cdg left21:39
← Phylock left21:40
← theoceaniscool_ left21:40
→ dfee1 joined21:41
→ johnny56 joined21:42
← Cabanossi left21:44
← Disgeae left21:45
← cur8or_ left21:47
→ Cabanossi joined21:47
← jnavila left21:47
→ cur8or joined21:48
← bezhermoso left21:48
→ tnecniv joined21:49
← cur8or left21:50
← lss8 left21:50
→ cur8or joined21:50
← cur8or left21:52
→ blackmesa joined21:52
→ cur8or joined21:52
← cur8or left21:53
← atomi left21:53
→ cur8or joined21:53
→ ArcaTech joined21:53
→ atomi joined21:53
→ dre_ joined21:54
→ DolphinDream joined21:54
→ Disgeae joined21:54
← schleppel left21:55
DolphinDream howdy gitsters21:56
how do i change the author name to a bunch of commits but keep the commiter date ? I tried this: git rebase -i master -x "git commit --amend --reset-author --no-edit" .. but this changes the date21:56
← cur8or left21:57
← stoopkid left21:57
← orbyt_ left21:57
← Noldorin left21:57
→ cur8or joined21:58
→ Noldorin joined21:58
← Noldorin left21:59
→ Noldorin joined22:01
→ BenderRodriguez joined22:01
→ orbyt_ joined22:02
→ dreiss joined22:02
← indistylo left22:03
← troulouliou_dev left22:03
→ hahuang65 joined22:04
← dersand left22:05
→ gauravgoyal joined22:05
→ cdg joined22:06
← texinwien left22:07
→ marlinc joined22:07
markmarkmark DolphinDream: I think you can do that with filter-branch22:09
← hahuang65 left22:09
← gauravgoyal left22:09
DolphinDream markmarkmark: sure.. i also figured out this would do it: git rebase -i master -x "git commit --amend --author ‘New Name [email@hidden.address] -CHEAD"22:10
← nast left22:10
← cdg left22:11
→ peterbecich joined22:11
→ vrc414 joined22:12
→ texinwien joined22:13
→ cdg joined22:15
→ koell joined22:16
← Disgeae left22:17
← vrc414 left22:18
→ muelleme joined22:18
→ Bobguy joined22:19
← Bobdude left22:19
← cdg left22:19
← orbyt_ left22:22
→ tarkus joined22:22
→ bezhermoso joined22:24
← muelleme left22:24
→ Munt_ joined22:25
← om_henners left22:26
→ om_henners joined22:27
→ alyce joined22:32
→ denimsoft joined22:33
← tnecniv left22:34
→ rishi joined22:34
→ txeno joined22:34
txeno hi, I fail to get any of the configs to allow self signed certificates to work22:34
what's the proper way to disable it (globally) with the latest git version?22:35
← dreiss left22:36
mud txeno: Usually to not. Is there really no other way except self-signed?22:36
You know you can get freebie actual CA certs now, right? It's even easy.22:37
← tbstbs left22:37
txeno I know, but right now that's what I need22:38
→ theoceaniscool_ joined22:38
→ converge joined22:39
← converge left22:39
→ vrc414 joined22:40
← alyce left22:41
← tarkus left22:44
← theoceaniscool_ left22:46
→ jeffreylevesque joined22:48
← pbandark left22:49
→ jeffreylevesque_ joined22:49
→ shinnya joined22:50
← denimsoft left22:51
→ denimsoft joined22:51
→ SwiftMatt joined22:51
← denimsoft left22:52
→ denimsoft joined22:52
← denimsoft left22:53
← jeffreylevesque left22:53
→ denimsoft joined22:53
← denimsoft left22:53
→ goweol1 joined22:54
→ markmarkmark joined22:55
← texinwien left22:56
→ alyce joined22:57
← wootehfoot left22:57
← SwiftMatt left22:58
← goweol left22:58
← drodger left22:59
← Cabanossi left22:59
← Kestrel-029 left22:59
← Hu0p left23:00
→ drodger joined23:01
→ Cabanossi joined23:02
→ nast joined23:02
→ tarkus joined23:03
→ tnecniv joined23:05
→ thinkpad joined23:05
← gugah left23:06
→ Nicmavr joined23:06
→ cdown joined23:06
Nicmavr → Guest9501823:06
→ snowkidind joined23:06
→ nast_ joined23:08
← diqidoq left23:08
→ SwiftMatt joined23:10
← cur8or left23:10
→ lss8 joined23:10
← bezhermoso left23:11
← jottr left23:13
← koell left23:14
→ Hu0p joined23:15
→ Doginal_ joined23:15
← rafasc left23:16
← Doginal left23:16
Doginal_ → Doginal23:16
← Mattiaslndstrm left23:17
→ Mattiaslndstrm joined23:18
← energizer left23:18
→ energizer joined23:18
← blackmesa left23:20
← Es0teric left23:21
← ZyX-I left23:24
← SwiftMatt left23:26
← alyce left23:32
→ diqidoq joined23:33
→ rafasc joined23:34
← |ifei5g00d left23:35
→ |ifei5g00d joined23:35
→ clickjack joined23:36
→ blackmesa joined23:37
← clickjac_ left23:39
→ hahuang65 joined23:40
← mikecmpbll left23:40
← Bobguy left23:41
← peepsalot left23:42
← jstein left23:43
← hahuang65 left23:45
→ Raed|Laptop joined23:46
← CussBot left23:47
→ olaaa joined23:47
→ CussBot joined23:47
→ Doginal_ joined23:48
← mattheweigand left23:48
← Doginal left23:49
Doginal_ → Doginal23:49
→ mattheweigand joined23:49
← dege left23:52
← TikityTik left23:52
← Tobbi left23:53
← blackmesa left23:53
← olaaa left23:53
→ olalonde joined23:53
→ bezhermoso joined23:54
→ peepsalot joined23:55
← tnecniv left23:56
→ stevenbenner joined23:56
← Raed|Laptop left23:58
→ Raed|Laptop joined23:59

Logs Search ←Prev date Next date→ Channels Documentation