Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-13

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:00 zacts joined #git
00:01 thebloggu joined #git
00:01 eka joined #git
00:02 catag87 joined #git
00:06 qpdb joined #git
00:08 m0viefreak joined #git
00:10 livingstn joined #git
00:10 JacobsLadd3r joined #git
00:13 vassagus joined #git
00:14 zumba_addict joined #git
00:15 Thorn joined #git
00:16 zumba_addict joined #git
00:27 JacobsLa_ joined #git
00:27 JacobsLa_ ./join #github
00:28 offlim joined #git
00:31 JacobsLa_ joined #git
00:33 JacobsLadd3r joined #git
00:34 vassagus joined #git
00:35 hahuang61 joined #git
00:37 mingrammer joined #git
00:39 tgunr joined #git
00:44 hdon joined #git
00:45 veilig2000 joined #git
00:46 kyan joined #git
00:47 offlim joined #git
00:49 Lipp joined #git
00:57 vassagus joined #git
01:00 tesuji_ joined #git
01:00 RandomNoob left #git
01:01 fractalizator_ joined #git
01:05 sim590 joined #git
01:07 Faylite_ joined #git
01:07 sim590 joined #git
01:07 JustAnotherIdiot joined #git
01:08 sebascar joined #git
01:13 romerocesar joined #git
01:17 cjbrambo joined #git
01:17 kbs joined #git
01:18 pks joined #git
01:19 d^sh joined #git
01:19 al-damiri joined #git
01:22 kbs Quick q about the git-diff-tree algorithm - outside the source code comments, any pointers to information about the algorithm itself? [I'd like to be spoon-fed a nice paper :-) but any relevant discussions/explanatory context would be great too]
01:24 kbs I guess specifically - what I'm interested in is not textual diff, but simply identifying which blobs have been added/removed/modified between two trees
01:25 diphtherial i don't know, but i'm curious as well
01:26 Azulien joined #git
01:27 Dougie187 joined #git
01:27 ojacobson that's honestly the easy part
01:28 ojacobson you can recursively enumerate a tree to obtain the hashes of each file
01:28 ojacobson eh... looking at the data structure will probably clue you in. `git ls-tree HEAD`
01:28 diphtherial i assume 'recursively enumerate' is the same thing as 'traverse'?
01:28 ojacobson sure
01:28 kbs right, though I (maybe incorrectly) assumed it would optimize around common paths in both trees
01:29 MattMaker joined #git
01:30 ojacobson probably. If two subtrees are identical, then the hash of their tree objects will be identical
01:30 ojacobson and you can skip the entire subtree
01:30 thiago joined #git
01:31 * kbs just realized his real problem doesn't quite map to what git might do :)
01:31 mingrammer joined #git
01:31 kbs somewhat tangentially, I've been working on radix trees - and trying to see if there's a clever way to discover differences between the paths in two trees other than enumerating all of them
01:32 ojacobson in git that's pretty trivial
01:32 kbs git would treat a tree: a -> b -> c differently from a -> bc, which in my case would count as the same
01:33 mellernoia joined #git
01:33 MattMaker joined #git
01:35 kbs so I'm more than happy to learn about any trivial (or non-trivial :) ways to quickly figure out what paths have been added/removed between two tries (can assume prefix-free)
01:37 zivester joined #git
01:40 MattMaker joined #git
01:40 NeverDie joined #git
01:42 Guest21717 left #git
01:46 p4trix joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
01:49 EvilPeng1 joined #git
01:49 kadoban joined #git
01:53 pointyCircle joined #git
01:56 mehola joined #git
01:56 vassagus joined #git
01:57 synchronous joined #git
02:00 Limes_ joined #git
02:01 ytl_ joined #git
02:03 dhollinger joined #git
02:08 tesuji joined #git
02:12 RedneckDonut joined #git
02:15 ResidentBiscuit joined #git
02:20 Vgr_ joined #git
02:20 Vgr_ joined #git
02:20 vassagus joined #git
02:21 Electrometro joined #git
02:26 mingrammer joined #git
02:30 Geo joined #git
02:32 chachasmooth joined #git
02:34 beyertech joined #git
02:35 Manuel15 joined #git
02:35 Manuel15 joined #git
02:35 beyertech joined #git
02:36 hahuang61 joined #git
02:36 madewokherd joined #git
02:37 marcm joined #git
02:38 vassagus joined #git
02:39 marcm I'm wondering if someone would be kind enough to show me an example of how a Version Tag looks like for Git Flow?
02:39 marcm Thank you.
02:41 Geo left #git
02:41 lagothrix joined #git
02:42 godzill42 joined #git
02:44 beyertech joined #git
02:44 doppel joined #git
02:44 doppel left #git
02:45 hexagoxel joined #git
02:45 fractalizator joined #git
02:45 fractalizator left #git
02:46 EvilPeng1 joined #git
02:46 l4v2 joined #git
02:47 clemf joined #git
02:51 skylite joined #git
02:53 paralleltwin joined #git
02:55 Goplat joined #git
02:56 vassagus joined #git
02:57 mehola joined #git
03:02 rbern joined #git
03:07 Electrometro joined #git
03:07 lindenle joined #git
03:08 l4v2 joined #git
03:08 Mowgli joined #git
03:12 safe joined #git
03:12 fstd_ joined #git
03:13 romerocesar joined #git
03:14 Rodya_ joined #git
03:16 Dougie187 left #git
03:20 Sample joined #git
03:24 vassagus joined #git
03:26 tgunr joined #git
03:29 le_melomane joined #git
03:29 dhollinger joined #git
03:32 dhollinger joined #git
03:36 Rodya_ joined #git
03:41 Jon28 joined #git
03:48 adambrenecki joined #git
03:49 sagerdearia joined #git
03:50 vassagus joined #git
03:56 zeemz joined #git
03:57 pi__ joined #git
04:03 MrWoohoo joined #git
04:04 Lipp joined #git
04:05 thecomedian joined #git
04:08 dhollinger joined #git
04:10 bluezone joined #git
04:11 vassagus joined #git
04:12 a_thakur joined #git
04:13 JanC_ joined #git
04:14 mingrammer joined #git
04:14 a_thakur_ joined #git
04:18 a_thakur joined #git
04:20 chandu20 joined #git
04:21 vrishab joined #git
04:22 bq_ joined #git
04:22 vigilvindex joined #git
04:23 johnny56_ joined #git
04:23 bq_ joined #git
04:27 Cabanossi joined #git
04:28 tgunr joined #git
04:29 a_thakur joined #git
04:31 MissionCritical joined #git
04:31 a_thakur joined #git
04:34 ShekharReddy joined #git
04:37 hahuang61 joined #git
04:37 danimal2 joined #git
04:38 vassagus joined #git
04:44 nilg joined #git
04:44 HanClinto_ joined #git
04:48 inflames joined #git
04:50 t-mart joined #git
04:51 phaleth joined #git
04:57 danimal2 joined #git
04:57 mehola joined #git
04:58 dsdeiz joined #git
04:58 dsdeiz joined #git
04:59 csd_ joined #git
05:00 alansaul joined #git
05:02 vassagus joined #git
05:08 mingrammer joined #git
05:10 Mowgli joined #git
05:11 evanvarvell joined #git
05:12 steven_a_s joined #git
05:12 LeBlaaanc joined #git
05:14 romerocesar joined #git
05:18 a_thakur joined #git
05:19 Lyqyd joined #git
05:21 hassonofer joined #git
05:22 vassagus joined #git
05:23 hassonofer Hey, I have a commit, which cannot be found anywhere but still git show HASH shows it. I want to remove it completly, can anyone help ? I followed: https://stackoverflow.com/questions/3​765234/listing-and-deleting-git-commi​ts-that-are-under-no-branch-dangling with no success
05:23 magicTurtle joined #git
05:24 cd-rum joined #git
05:27 drbean joined #git
05:28 cd-rum_ joined #git
05:29 _ikke_ hassonofer: And it's not enough to wait until the GC swallows it?
05:29 hassonofer No...
05:30 _ikke_ You'd have to expire the reflog (the thing keeping you safe lossing thing)
05:31 govg joined #git
05:32 _ikke_ git reflog --expire-unreachable=now && git gc --prune
05:34 hassonofer Does not clean that commit
05:34 drbean joined #git
05:35 _ikke_ git gc --prune=now
05:36 meloc joined #git
05:37 hassonofer already tried that
05:41 godzill42 joined #git
05:41 _ikke_ Then it's still being referenced somewhere
05:44 drbean joined #git
05:44 cdown joined #git
05:44 Sample joined #git
05:47 hassonofer How can I found out where ?
05:48 thiago git branch -a --contains <thatcommit>
05:48 thiago why do you need to delete this commit?
05:49 hassonofer this command returns nothing...
05:49 thiago then you must still have a reflog
05:49 hassonofer I accidently commited very large binary
05:49 thiago and?
05:49 JacobsLadd3r joined #git
05:49 hassonofer ok, I have a reflog
05:50 hassonofer I'm not sure what it means
05:50 star_prone joined #git
05:50 thiago what's the problem with having committed by accident, since it's no longer in the history?
05:50 hassonofer I dont want people that clone it to download it...
05:51 mehola joined #git
05:51 _ikke_ Won't happen
05:51 cdown_ joined #git
05:51 _ikke_ git clone only clones things reachable from refs
05:51 hassonofer so the reflog has no effect ?
05:52 _ikke_ no
05:52 hassonofer good to hear
05:52 thiago it has effect only on what you can see via reflog
05:52 thiago not via cloning
05:52 hassonofer just out of curiosity, how do I delete it ?
05:52 thiago the reflog? rm -rf .git/logs
05:52 thiago another way to solve this problem: clone your repository
05:52 hassonofer this will not damage the repository ?
05:53 thiago no, but you should try cloning first
05:53 hassonofer ok
05:53 hassonofer thanks
05:53 thiago make sure you clone using a URL, not file path. Or you tell clone not to share data.
05:56 Electrometro joined #git
05:57 vassagus_ joined #git
05:57 hassonofer Thanks guys
05:58 hassonofer just fonud how to clean the reflog as well
05:58 hassonofer git for-each-ref --format='delete %(refname)' refs/original | git update-ref --stdin
05:58 hassonofer git reflog expire --expire=now --all
05:58 hassonofer git gc --prune=now
06:06 Spydar007 joined #git
06:07 vrishab joined #git
06:08 Lipp joined #git
06:11 cdown_ joined #git
06:12 netj_ joined #git
06:28 vassagus joined #git
06:29 subhojit777 joined #git
06:31 bocaneri joined #git
06:35 ahmedelgabri joined #git
06:37 GodEater` left #git
06:37 GodEater joined #git
06:37 hahuang61 joined #git
06:38 jmd joined #git
06:38 zeemz joined #git
06:39 LucaTM joined #git
06:39 cdown_ joined #git
06:41 zeemz joined #git
06:45 chan20 joined #git
06:46 GodEater joined #git
06:47 HanClinto_ joined #git
06:52 Mission-Critical joined #git
06:54 nikivi joined #git
06:54 vassagus joined #git
06:56 mingrammer joined #git
06:58 jmd Developing with git reminds me of secondary school.
06:58 _ikke_ Enlighten us
06:59 jmd Well people keep telling me to see HEADmaster
07:02 unforgiven512 joined #git
07:02 hdon joined #git
07:02 afuentes joined #git
07:03 unforgiven512 joined #git
07:03 unforgiven512 joined #git
07:04 unforgiven512 joined #git
07:04 unforgiven512 joined #git
07:05 unforgiven512 joined #git
07:06 unforgiven512 joined #git
07:06 unforgiven512 joined #git
07:07 unforgiven512 joined #git
07:07 unforgiven512 joined #git
07:08 unforgiven512 joined #git
07:09 unforgiven512 joined #git
07:09 unforgiven512 joined #git
07:11 cdown joined #git
07:15 romerocesar joined #git
07:16 Kartagis joined #git
07:16 vassagus joined #git
07:17 cdown_ joined #git
07:17 ahmedelgabri joined #git
07:18 a_thakur joined #git
07:22 slayerjain joined #git
07:25 Seveas jmd: and now you get to stand in the penalty box for making a bad joke
07:27 subhojit_ joined #git
07:28 t0by joined #git
07:28 chan20 left #git
07:37 nidr0x joined #git
07:39 vassagus joined #git
07:40 tanuki joined #git
07:43 tanuki joined #git
07:43 kus joined #git
07:46 Mowgli joined #git
07:47 dsantiago joined #git
07:51 mingrammer joined #git
07:55 a_thakur joined #git
07:56 elementalest joined #git
07:57 zeemz joined #git
07:57 SteffanW joined #git
08:01 emPi joined #git
08:03 cagedwisdom joined #git
08:05 paranoidabhi joined #git
08:05 paranoidabhi hi
08:05 jmd ho
08:05 vassagus joined #git
08:05 paranoidabhi I am a new to fork git repos from github. I am facing a proble,
08:05 paranoidabhi *m
08:06 paranoidabhi I forked a repo. and made some changes to it. Now, the original repo. made some other non-conflicting changes.
08:06 zeroed joined #git
08:06 cyphase joined #git
08:06 paranoidabhi Q: how I can pull the changes from the original repo to the forked one?
08:07 jmd paranoidabhi: Try #github
08:07 paranoidabhi JOIN #github
08:08 paranoidabhi ooops..
08:08 paranoidabhi jmd, thanks will do.
08:10 a_thakur joined #git
08:11 Junior joined #git
08:12 a_thakur_ joined #git
08:13 tomog999 joined #git
08:18 InfoTest joined #git
08:19 dsdeiz joined #git
08:19 dsdeiz joined #git
08:24 davisonio joined #git
08:25 eivarv joined #git
08:30 vassagus joined #git
08:30 zumba_addict joined #git
08:32 Rish joined #git
08:37 Kicer86 joined #git
08:38 hahuang61 joined #git
08:39 stuh84 joined #git
08:39 subhojit_ joined #git
08:39 LucaTM joined #git
08:39 ahmedelgabri joined #git
08:42 HanClinto joined #git
08:44 yqt joined #git
08:45 zarubin joined #git
08:45 Seva_ joined #git
08:45 mingrammer joined #git
08:52 iskander joined #git
08:54 vassagus joined #git
08:57 eivarv joined #git
09:00 romerocesar joined #git
09:01 skalpin is there an easy way to get an ohmyzsh like prompt on windows?
09:02 yoan joined #git
09:04 GenZai joined #git
09:05 jmd skalpin: I have no idea.
09:05 jmd How is it relevant to git?
09:08 leeN joined #git
09:14 skalpin jmd: I want it for the git features.
09:15 Seveas skalpin: on windows 10 you can run native linux programs these days. Try running zsh that way
09:16 vassagus_ joined #git
09:22 davisonio joined #git
09:23 robotroll joined #git
09:24 Tapas joined #git
09:29 styx_ joined #git
09:32 pointyCircle joined #git
09:36 flavius joined #git
09:39 hahuang61 joined #git
09:42 vassagus joined #git
09:43 fahadash joined #git
09:43 FuzzySockets joined #git
09:49 antismap joined #git
09:50 zarubin joined #git
09:50 FuzzySockets joined #git
09:58 paranoidabhi if I go back some commits and then make a new commit.
09:59 paranoidabhi will the previous commits be lost?
09:59 cbreak paranoidabhi: depends
09:59 nivag joined #git
09:59 paranoidabhi Previous A->B->C...I change A->B->D, is C lost?
09:59 cbreak paranoidabhi: if you just check out the previous commit, then the new commit you make will be lost
09:59 paranoidabhi cbreak, on what?
09:59 cbreak if you use rebase -i, then no commit is lost, but all after B are changed
10:00 cbreak if you use merge, then no commit is list, but there's a merge of C and D afterwards
10:00 cbreak !cs
10:00 gitinfo "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/g​it-for-computer-scientists/ See also !concepts !bottomup
10:00 paranoidabhi cbreak, I don't wan to merge C and D.
10:00 cbreak then use rebase -i
10:01 cbreak something like rebase -i A
10:01 jknetl joined #git
10:01 de-vri-es joined #git
10:01 cbreak then select B for editing
10:01 cbreak then, while you're on B, create C
10:01 cbreak then, rebase --continue
10:01 cbreak you'll get a new D, rebased onto the C you just made
10:04 Lipp joined #git
10:05 romerocesar_ joined #git
10:06 artemisart joined #git
10:10 veilig2000 joined #git
10:10 ffio joined #git
10:12 eivarv joined #git
10:18 m0viefreak joined #git
10:19 nikivi joined #git
10:21 netcarver joined #git
10:22 nikivi joined #git
10:24 Sadeukko joined #git
10:25 jmd left #git
10:25 toydestroyer joined #git
10:26 vassagus joined #git
10:26 Mowgli joined #git
10:28 veilig2000 joined #git
10:33 cyan__ joined #git
10:33 mingrammer joined #git
10:35 ljc joined #git
10:45 Sadeukko joined #git
10:46 csd_ joined #git
10:52 jost joined #git
10:53 yqt joined #git
10:53 vassagus joined #git
10:55 bq_ joined #git
10:55 eivarv joined #git
10:56 blackwind_123 joined #git
10:56 bq_ joined #git
10:57 bq_ joined #git
10:59 bq_ joined #git
11:00 bq_ joined #git
11:04 mohabaks joined #git
11:05 artemisart joined #git
11:09 beyertech joined #git
11:10 kutsuya joined #git
11:11 settermjd joined #git
11:15 stamina joined #git
11:18 ojdo joined #git
11:21 stamina joined #git
11:24 zapb_ joined #git
11:27 cmn joined #git
11:28 mingrammer joined #git
11:28 vassagus joined #git
11:29 drbean joined #git
11:36 liuzhen joined #git
11:40 hahuang61 joined #git
11:40 p4trix joined #git
11:48 mohabaks joined #git
11:51 hdon joined #git
11:52 mehola joined #git
11:52 Finnoloid joined #git
11:54 vassagus joined #git
12:19 Maple__ joined #git
12:22 SteffanW2 joined #git
12:22 bartosz_ joined #git
12:24 sdothum joined #git
12:27 Spec-Chum joined #git
12:28 t0by joined #git
12:30 vassagus_ joined #git
12:32 kirb joined #git
12:34 shaggycat joined #git
12:35 kirb i think i'm hitting a bug with rebase – at least, it's not something i've seen before
12:35 a3Dman joined #git
12:36 HappyLoa- joined #git
12:37 _ikke_ Alright, where do you run into?
12:38 sanketdg joined #git
12:38 kirb i have some commits on master locally, and one from origin/master i want to rebase. this has always worked, but after a few rebases it says there is a conflict. except, there's nothing to fix, and the one remote commit is on a file i didn't touch
12:38 _ikke_ What does git status say when you get the conflict?
12:39 sanketdg how can I output the last 9 commit hashes on my branch space separated?
12:40 Lipp joined #git
12:40 kirb https://ghostbin.com/paste/nzexn
12:40 _ikke_ git log -9 --format="%H" | xargs echo
12:41 _ikke_ kirb: "Your local changes to the following files would be overwritten by merge:"
12:41 davisonio joined #git
12:41 kirb yes, and that's not actually the case
12:41 _ikke_ Why do you think so?
12:42 kirb the one commit from the remote hasn't changed the files, or anything else i've committed
12:42 kirb the listed files*
12:43 _ikke_ That's not what it's saying
12:43 kirb hence why it must be a bug
12:43 _ikke_ "Your local changes" refer to uncomitted changes, either to tracked or untracked files
12:44 _ikke_ Becase rebase requires a clean working tree, it must be talking about untracked files
12:44 kirb nope no untracked files
12:44 _ikke_ Not even ignores?
12:45 _ikke_ ignored
12:45 kirb how would that matter though?
12:46 kirb again it's always worked before… i don't know what i've changed
12:46 Darcidride joined #git
12:46 kus joined #git
12:46 _ikke_ If a file is ignored, but then tracked remotely, you'll get this message
12:47 csd_ joined #git
12:47 kirb and same happened a few days ago; lost commits because i assumed from that message that i'm meant to --skip
12:47 kyan joined #git
12:47 kirb on a different repo
12:48 kirb ignores haven't changed; the remote commit modifies one existing file
12:48 _ikke_ kirb: git ls-files springboard/Makefile
12:49 kirb in or out of a rebase?
12:49 _ikke_ Doesn't matter
12:49 kirb prints back springboard/Makefile
12:50 _ikke_ Ok, so it is tracked
12:50 alansaul joined #git
12:52 _ikke_ Can you look what's inside .git/rebase-apply/patch
12:52 _ikke_ ?
12:52 mehola joined #git
12:54 kirb contains exactly my commit
12:54 azerus joined #git
12:55 kirb also, rebasing again failed earlier, at "[global] we're fully arc now"
12:58 davisonio joined #git
12:59 Didac joined #git
13:01 JanC_ joined #git
13:09 zivester joined #git
13:12 artemisart joined #git
13:13 Cassiopaya joined #git
13:13 Sadeukko joined #git
13:15 IlNominePatre joined #git
13:16 mingrammer joined #git
13:18 fstd joined #git
13:22 tesuji joined #git
13:24 pks joined #git
13:24 Kulrak joined #git
13:24 Kulrak joined #git
13:26 unforgiven512 joined #git
13:27 [Brain] joined #git
13:28 cdown joined #git
13:31 kutsuya joined #git
13:35 CheckDavid joined #git
13:37 Bombe joined #git
13:39 HappyLoa- joined #git
13:40 hahuang61 joined #git
13:42 mohabaks joined #git
13:44 rahtgaz joined #git
13:44 israelzuniga joined #git
13:45 ahmedelgabri joined #git
13:48 Orbitrix joined #git
13:53 vassagus joined #git
13:53 mehola joined #git
13:54 l4v2 joined #git
13:55 rossome joined #git
13:57 Mowgli joined #git
13:58 mingrammer joined #git
13:58 eivarv joined #git
13:58 harish_ joined #git
13:59 TRUMP-PENCE joined #git
14:01 TRUMP-PENCE joined #git
14:05 jknetl joined #git
14:06 TRUMP-PENCE joined #git
14:08 TRUMP-PENCE joined #git
14:08 veilig2000 joined #git
14:10 TRUMP-PENCE joined #git
14:13 TRUMP-PENCE joined #git
14:16 nidr0x joined #git
14:17 a_thakur joined #git
14:20 SteffanW joined #git
14:21 clemf joined #git
14:22 Noldorin joined #git
14:26 star_prone joined #git
14:27 davisonio joined #git
14:27 joki joined #git
14:31 ahmed_elgabri joined #git
14:32 roxtrongo joined #git
14:34 Manuel15 joined #git
14:34 Manuel15 joined #git
14:38 Vampire0 joined #git
14:43 Mir4g3 joined #git
14:45 beyertech joined #git
14:45 fahadash joined #git
14:46 mariuscc joined #git
14:46 azerus joined #git
14:51 zacts joined #git
14:53 davisonio joined #git
14:53 livingstn joined #git
14:55 l4v2 joined #git
14:56 cagomez joined #git
14:57 giraffe joined #git
15:02 linuxmint joined #git
15:03 azerus joined #git
15:04 csd_ joined #git
15:04 vassagus joined #git
15:06 mingrammer joined #git
15:08 chandu20 joined #git
15:10 jknetl joined #git
15:11 Meow_J joined #git
15:12 mingrammer joined #git
15:13 airdisa joined #git
15:14 ffio joined #git
15:16 joki joined #git
15:19 Vampire0 joined #git
15:19 mingrammer joined #git
15:20 madewokherd joined #git
15:21 clemf joined #git
15:23 fractalizator joined #git
15:23 mingrammer joined #git
15:23 clemf joined #git
15:23 fractalizator left #git
15:24 mingrammer joined #git
15:27 mohabaks joined #git
15:27 govg joined #git
15:27 Goplat joined #git
15:31 kutsuya joined #git
15:31 joki joined #git
15:31 jaafar joined #git
15:32 romerocesar joined #git
15:35 VladGh joined #git
15:36 mingrammer joined #git
15:38 hosttor joined #git
15:38 ahmed_elgabri joined #git
15:38 afuentes joined #git
15:39 VladGh joined #git
15:41 diphtherial left #git
15:41 hahuang61 joined #git
15:43 garethdaine joined #git
15:43 veilig2000 joined #git
15:47 marcm joined #git
15:50 joki joined #git
15:50 constant joined #git
15:52 Ranhir joined #git
15:53 Darren_ joined #git
15:56 mehola joined #git
15:56 robotroll joined #git
15:57 l4v2 joined #git
15:57 _Cyclone_ joined #git
16:00 cagomez joined #git
16:00 joki joined #git
16:01 Claudio joined #git
16:01 PCatinean joined #git
16:02 sagerdearia joined #git
16:02 romerocesar joined #git
16:07 nikivi joined #git
16:16 Prisoner-2460_1_ joined #git
16:17 zacts joined #git
16:19 robotroll joined #git
16:20 diphtherial joined #git
16:20 diphtherial should i uninstall git bash before installing git for windows?
16:20 diphtherial (i'm hoping questions about git for windows are appropriate here; if not, my apologies)
16:21 rewt i don't think it matters, but if you're not sure you might as well uninstall it first
16:21 rewt git for windows comes with it, so it'll get reinstalled
16:22 thiago joined #git
16:22 joki joined #git
16:22 diphtherial right, i assumed it did; i just didn't want the older version (or any associated cruft) to be hanging around alongside the new one
16:23 diphtherial i'll go ahead and uninstall it, then
16:23 diphtherial in retrospect that was a pretty silly question
16:27 superchar joined #git
16:29 archana joined #git
16:30 davisonio joined #git
16:30 groundnuty hey, I would like to write a simple bash condition that will return true if file has not changed and false it it did
16:30 groundnuty I try to use git  --no-pager diff <file>
16:30 groundnuty but it returns 0 code for both cases
16:31 groundnuty any suggestions regarding git command I could use?
16:31 mingrammer joined #git
16:32 diphtherial wow, the replacement terminal in the new version of git for windows is pretty neat
16:33 diphtherial (i was previously on the 1.x version, so 2.x is a huge jump)
16:35 Exagone313 joined #git
16:36 d5sx43 joined #git
16:37 ahmed_elgabri joined #git
16:37 meadmoon joined #git
16:40 mikecmpbll joined #git
16:42 eivarv joined #git
16:43 khmarbaise joined #git
16:44 l4v2 joined #git
16:44 Repox joined #git
16:45 tanuki joined #git
16:46 romerocesar joined #git
16:47 tanuki joined #git
16:47 peepsalot joined #git
16:47 sullyj3 joined #git
16:48 tanuki joined #git
16:52 daynaskully joined #git
16:54 drbean joined #git
16:54 star_prone joined #git
16:56 UTAN_dev_ joined #git
17:00 jost joined #git
17:02 Limes_ joined #git
17:03 vassagus joined #git
17:04 quackgyver joined #git
17:06 moop joined #git
17:09 johnnyfive joined #git
17:10 SteffanW joined #git
17:13 Maple__ joined #git
17:14 Maple__ joined #git
17:15 fmcgeough joined #git
17:17 venmx joined #git
17:20 Maple__ joined #git
17:20 venmx joined #git
17:21 mehola joined #git
17:21 omegak joined #git
17:22 fahadash joined #git
17:24 diphtherial it'd be nice if i could just get the package manager in the 'git for windows SDK' without cloning git itself...
17:25 diphtherial all i want is a decent build enviroment
17:25 mingrammer joined #git
17:27 Prisoner-2460_1_ trying to squash. i have four commits on master. i do git rebase -i HEAD~4 and it tells me: fatal: Needed a single revision
17:27 Prisoner-2460_1_ invalid upstream HEAD~4
17:27 _ikke_ Does that happen to be the root commit?
17:28 unbalancedparen joined #git
17:28 _ikke_ ygit rebase --root
17:28 Prisoner-2460_1_ does that mean the initial commit?
17:29 _ikke_ yes
17:30 Prisoner-2460_1_ ah ha, did HEAD~3 and that works. was just testing it out but i wont have that problem on the real project
17:30 _ikke_ right
17:30 Prisoner-2460_1_ but rebase —root will squash.. all of them
17:30 Prisoner-2460_1_ ?
17:30 tgunr joined #git
17:31 OptimusMKD joined #git
17:32 omegak joined #git
17:33 _ikke_ It will let you squash all of them, yes
17:33 csd_ joined #git
17:35 eivarv joined #git
17:36 rpd joined #git
17:36 Smirnov joined #git
17:36 vassagus joined #git
17:37 jrnieder joined #git
17:38 Nex6 joined #git
17:38 stasmakarov joined #git
17:38 israelzuniga joined #git
17:38 diphtherial hrm, so i've installed the git for windows SDK, and now it appears i have both the old 'git for windows' that i installed earlier without gcc on the path, and a new 'git for windows SDK' that does have gcc
17:40 diphtherial ok, uninstalled the non-SDK version, although it required navigating to the program directory and running the uninstaller from there, as there's just one entry in the programs control panel for git now
17:40 diphtherial perhaps the SDK doesn't add one
17:41 sbeller joined #git
17:41 govg joined #git
17:42 hahuang61 joined #git
17:42 Smirnov joined #git
17:43 diegoviola joined #git
17:43 jrnieder joined #git
17:45 l4v2 joined #git
17:46 clemf joined #git
17:47 clemf_ joined #git
17:48 blackwind_123 joined #git
17:48 clemf joined #git
17:49 clemf joined #git
17:50 blackwind_123 joined #git
17:51 clemf_ joined #git
17:51 eivarv joined #git
17:52 clemf joined #git
17:53 clemf joined #git
17:55 JanC_ joined #git
17:56 star_prone joined #git
17:56 watabou joined #git
17:57 mohabaks joined #git
18:02 blackwind_123 joined #git
18:04 vassagus_ joined #git
18:12 tgunr joined #git
18:12 dsdeiz joined #git
18:13 Spec-Chum Not really a git question, per se, but related.  In git bash it tells me what branch I'm on, any way to do this on msys2 bash?
18:15 spudowiar joined #git
18:18 Derperperd joined #git
18:19 nanga joined #git
18:19 nanga joined #git
18:23 Achylles joined #git
18:25 bmahe joined #git
18:25 rewt Spec-Chum, git bash appears to load /etc/profile when it starts, which calls /etc/profile.d/git-prompt.sh ... see if you can get msys2 bash to call /etc/profile too... or if they're separate, copy that git-prompt.sh from the git bash tree to the msys2 tree
18:27 choki joined #git
18:31 Lipp joined #git
18:32 vassagus joined #git
18:33 nwkj86 joined #git
18:34 spudowiar joined #git
18:35 Dougie187 joined #git
18:35 eivarv joined #git
18:35 user083 joined #git
18:35 Spec-Chum rewt, cheers, I'll take a look :)
18:37 tgunr joined #git
18:38 NeverDie joined #git
18:38 t-mart joined #git
18:41 mingrammer joined #git
18:42 spudowiar joined #git
18:42 johnny56_ joined #git
18:44 gigq joined #git
18:45 HanClinto joined #git
18:46 Spec-Chum rewt, sorted it, thanks :)
18:47 kyan joined #git
18:51 vuoto joined #git
18:52 Manuel15 joined #git
18:52 Manuel15 joined #git
18:52 Exagone313 joined #git
18:54 sagerdearia joined #git
18:54 l4v2 joined #git
18:54 thoraxe joined #git
19:00 Darcidride joined #git
19:00 dhollinger joined #git
19:01 davisonio joined #git
19:04 shaggycat joined #git
19:06 poi_ joined #git
19:07 jason237 joined #git
19:08 dreiss joined #git
19:09 joi joined #git
19:11 Sample joined #git
19:12 Sadeukko joined #git
19:14 vuoto joined #git
19:16 mingrammer joined #git
19:21 Xizor joined #git
19:22 cyan__ joined #git
19:23 mellernoia joined #git
19:27 Rodya_ joined #git
19:30 stamina joined #git
19:33 dreiss joined #git
19:34 Lipp joined #git
19:35 p4trix joined #git
19:35 tubaman joined #git
19:39 diphtherial this is again probably off topic, but i've added a directory with executables in it to git bash's PATH, but for some reason they can't be found
19:39 diphtherial i can execute them directly if i give a full path, and yes i've escaped everything (the spaces, parentheses, and the drive specification) afaict
19:40 diphtherial the value in the PATH is /c/Program\ Files\ \(x86\)/nodejs (delimited by colons, of course)
19:40 diphtherial if i run /c/Program\ Files\ \(x86\)/nodejs/npm it works as expected, and other things i've added to the path can be found, too...
19:43 hahuang61 joined #git
19:43 Rish joined #git
19:45 berndj joined #git
19:47 zumba_addict joined #git
19:48 Exagone313 joined #git
19:49 Electrometro joined #git
19:51 zumba_addict joined #git
19:51 cagomez joined #git
19:53 nikivi joined #git
19:55 rockstar___ joined #git
19:55 Electrometro joined #git
19:56 b1tchcakes joined #git
19:59 fuchstronaut joined #git
20:03 vuoto_ joined #git
20:03 vuoto_ joined #git
20:03 Electrometro joined #git
20:04 vuoto joined #git
20:05 blackwell joined #git
20:05 Electrometro joined #git
20:05 Faylite joined #git
20:07 nikivi joined #git
20:08 mrpackethead joined #git
20:10 zumba_addict joined #git
20:11 blackwell joined #git
20:13 HappyLoa- joined #git
20:16 ceeb joined #git
20:17 livingstn joined #git
20:20 rockstar_____ joined #git
20:21 JacobsLadd3r joined #git
20:21 shymega joined #git
20:22 dreamyspell joined #git
20:24 JacobsLadd3r joined #git
20:25 JacobsLadd3r joined #git
20:26 al-damiri joined #git
20:26 JacobsLadd3r joined #git
20:27 JacobsLadd3r joined #git
20:29 hahuang61 joined #git
20:31 fmcgeough joined #git
20:32 Derperperd joined #git
20:36 lightstalker joined #git
20:39 zarubin_ joined #git
20:42 cdg joined #git
20:44 lightstalker joined #git
20:47 JacobsLadd3r joined #git
20:49 romerocesar joined #git
20:53 rgrinberg joined #git
21:00 beyertech joined #git
21:03 adambrenecki joined #git
21:04 mingrammer joined #git
21:07 Darcidride joined #git
21:07 cagomez joined #git
21:07 torbjorn joined #git
21:12 Darcidride joined #git
21:12 alansaul joined #git
21:15 filcab joined #git
21:16 CheckDavid joined #git
21:17 Darcidride joined #git
21:20 GenZai joined #git
21:21 dc_1989_chatlog joined #git
21:27 csd_ joined #git
21:27 tvw joined #git
21:28 torbjorn joined #git
21:29 rorro joined #git
21:36 blackwind_123 joined #git
21:38 clemf joined #git
21:39 ohyash joined #git
21:43 CussBot joined #git
21:43 nydel07 joined #git
21:43 star_prone joined #git
21:43 Darren_ joined #git
21:44 kadoban joined #git
21:47 l4v2 joined #git
21:47 Rodya_ joined #git
21:48 spudowiar joined #git
21:48 Vampire0_ joined #git
21:56 torbjorn joined #git
21:56 beyertech joined #git
21:57 dtrott joined #git
21:58 mingrammer joined #git
22:00 m0viefreak joined #git
22:00 aidalgol joined #git
22:06 cd-rum joined #git
22:07 clemf joined #git
22:10 fuchstronaut joined #git
22:10 rivarun joined #git
22:14 cyan__ joined #git
22:15 bluezone joined #git
22:17 Rodya_ joined #git
22:21 clemf_ joined #git
22:22 khmarbaise joined #git
22:25 nikivi joined #git
22:26 Bizkit joined #git
22:29 hahuang61 joined #git
22:32 shibo joined #git
22:33 shibo left #git
22:36 RedneckDonut joined #git
22:38 unreal joined #git
22:39 ahmedelgabri joined #git
22:41 nneeoo joined #git
22:41 iota_pi joined #git
22:41 torbjorn joined #git
22:42 bluezone joined #git
22:42 romerocesar joined #git
22:43 moop joined #git
22:48 HappyLoa- joined #git
22:48 NightStrike can I amend a commit that's not the most recent commit without committing a fake one and rebasing it to be a fixup?
22:55 berndj joined #git
22:57 rahtgaz joined #git
23:02 zmachine joined #git
23:03 zivester joined #git
23:04 Nex6 joined #git
23:05 jeffreylevesque joined #git
23:06 osse NightStrike: you can skip the fixup and mark the commit for editing during the rebase
23:06 NightStrike osse: sorry, I'm not sure I follo
23:06 NightStrike osse: sorry, I'm not sure I follow
23:07 NeXTSUN joined #git
23:08 osse NightStrike: which part
23:08 Lipp joined #git
23:09 bjd joined #git
23:10 NightStrike I don't know how to translate what you said into what I'd like to do, which is more like....   git commit --amend "commit#" file
23:10 kyan left #git
23:11 Surfer2010_ joined #git
23:11 osse NightStrike: if you have already made your changes then fixup is easier
23:11 kyan joined #git
23:11 fuchstronaut joined #git
23:11 NightStrike right now, I wind up doing....   git commit -a -m "xxx" ; git rebase -i
23:12 osse git commit --fixup=commit# and then git rebase -i --autosquash
23:12 NightStrike then I move the "xxx" line to where I want it and set it to "f" to discard the "xxx"
23:13 osse yes, and my suggestion was to mark the commit you want to amend with "e"
23:13 osse but if you've already made the changes then this is easier
23:13 osse --fixup and --autosquash make it smoother
23:14 NightStrike ok, I've never used autosquash before
23:14 NightStrike sounds like I still need two commands, tho....
23:14 osse NightStrike: it rearranges the list of commits automatically
23:14 osse provided you use --squash or --fixup when making the commit
23:15 Spec-Chum joined #git
23:16 osse and yes it'll be two commands, unless you make an alias
23:16 osse or script
23:16 osse i usually make several fixups and then rebase all of them in one go
23:17 osse then it's only N+1 commands :)
23:17 Mission-Critical joined #git
23:18 NightStrike ok
23:18 torbjorn joined #git
23:18 osse and you can make it so autosquash is default
23:18 BlaXpirit osse, you mean you make several small commits and apply them as fixups in one rebase?
23:18 bq_ joined #git
23:18 osse git config rebase.autosquash true
23:18 osse BlaXpirit: yes
23:18 osse if I need to fixup several different commits
23:19 BlaXpirit I've done that so much lately
23:19 BlaXpirit haven't heard of autosquash though
23:19 osse BlaXpirit: then your quality of life is about to improve
23:20 osse you've never heard of --squash and --fixup either then?
23:20 BlaXpirit probably not
23:21 BlaXpirit meh, seems like this is actually more nuisance
23:21 star_prone joined #git
23:22 osse how so?
23:22 diphtherial left #git
23:22 BlaXpirit because i need to look up commit names and make a mess in command line
23:23 osse it's a trade-off for not having to re-arrange the list by hand
23:23 osse and you can do --fixup=@~5
23:23 BlaXpirit when instead i can leave a quick note for myself and then more reliably rearrange these in a text editor
23:23 osse I often do --fixup=:/text and it'll find the right commit
23:24 BlaXpirit oh that's next level stuff, probably makes this better then
23:25 osse to each his and/or her own
23:26 osse I find the "quick note for myself" part tedious. and when I'm working like this I often have a log of recent stuff open somewhere else
23:26 _Patrick_ joined #git
23:27 csd_ joined #git
23:28 anuxivm joined #git
23:29 Gianormagantrous So ref~1 refers to said refs parent. Is the a way to refer to its child (if there is only one)?
23:29 osse Gianormagantrous: no
23:29 Gianormagantrous ok then
23:30 BlaXpirit I'm not sure if I'm surprised or not. conceptually it makes total sense, but still would be useful to have
23:30 BlaXpirit even if it involves a linear search
23:31 osse in git's design it wouldn't be possible to have a commit know its child because it means the commit would have to be modified after it has first been created
23:31 Gianormagantrous Also I guess it would not be a good practice because it would only work if ONE child exists
23:33 osse well in principle there could be a list of children. a commit can have more than one parent
23:33 osse or did you mean child + grandchild + ... ?
23:35 Gianormagantrous Say you did git branch -f master HEAD~1 and want to come back to where you where
23:35 Gianormagantrous git branch -f master HEAD?1
23:35 MissionCritical joined #git
23:35 osse that's easy. git branch doesn't change HEAD :P did you mean git checkout -b ?
23:36 kadoban_ joined #git
23:36 osse but if you did use git checkout -b then the reflog has your back
23:36 osse git branch -f master HEAD@{1}
23:38 Gianormagantrous What do you call the ref@{n} syntax ?
23:39 Gianormagantrous 'never saw/used the @
23:39 osse not sure it has a name. it accesses the reflog
23:39 osse man gitrevisions
23:39 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
23:39 osse master@{1} is the previous value of master. master@{2} is the one before that, etc.
23:39 osse works for HEAD to
23:39 Gianormagantrous ohhh I see
23:41 Gianormagantrous So no actual need (if you know what you want) to check the reflog. Quite nice.
23:41 vassagus joined #git
23:42 osse Gianormagantrous: correct.
23:42 osse Gianormagantrous: but I sometimes do master@{1} when the correct thing to do is master@{2}.
23:43 osse but since I did that *now* the correct thing is master@{3}. but in panick mode I just undid what I did wrong first so it's actually master@{4}
23:43 osse gaaaaaah
23:43 Gianormagantrous lol
23:43 osse that
23:43 osse that's when I check the reflog
23:46 mingrammer joined #git
23:48 Jon28_ joined #git
23:48 anuxivm joined #git
23:50 Shentino joined #git
23:52 _xor joined #git
23:57 a3Dman joined #git
23:59 cagomez joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary