Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-01

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

All times shown according to UTC.

Time Nick Message
00:04 aidalgol joined #git
00:09 aidalgol joined #git
00:10 whatitdo joined #git
00:14 Hess thanks unborn! happy new year
00:25 buffal0 joined #git
00:28 aidalgol joined #git
00:35 NeverDie_ joined #git
00:36 buffal0 joined #git
00:36 iveqy joined #git
00:36 bronson joined #git
00:42 shpew12 joined #git
00:43 buffffal00 joined #git
00:44 menip joined #git
00:44 paws_ joined #git
00:45 WayToDoor joined #git
00:54 buffal0 joined #git
01:01 mizu_no_oto joined #git
01:09 anuxivm joined #git
01:23 iDanoo left #git
01:31 meadmoon joined #git
01:35 dsdeiz joined #git
01:36 QualityAddict joined #git
01:37 bronson joined #git
01:42 meadmoon joined #git
01:55 anuxivm joined #git
01:59 gmacisme_ joined #git
02:00 elsevero joined #git
02:06 dar123 joined #git
02:06 finalbeta joined #git
02:15 pks joined #git
02:15 durham joined #git
02:24 durham_ joined #git
02:24 d^sh_ joined #git
02:25 buzzLightBeer joined #git
02:29 Atm0spher1c joined #git
02:38 bronson joined #git
02:39 slappymcfry joined #git
02:42 jrm joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and silly hats | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | Repository is actual size
02:51 looper joined #git
03:05 ToBeCloud joined #git
03:06 mizu_no_oto joined #git
03:06 CheckDavid joined #git
03:06 nowhere_man joined #git
03:10 jost joined #git
03:12 meadmoon joined #git
03:16 elsevero joined #git
03:20 mmattice joined #git
03:22 HoierM_ joined #git
03:23 ayogi joined #git
03:23 dsdeiz joined #git
03:29 dsdeiz joined #git
03:32 causasui joined #git
03:36 hexagoxel joined #git
03:37 mizu_no_oto joined #git
03:39 bronson joined #git
03:41 [0xAA] joined #git
03:46 mizu_no_oto joined #git
03:47 sunri5e joined #git
03:52 denimsoft joined #git
03:52 gtristan joined #git
03:57 m0viefreak joined #git
03:57 Vortex35 joined #git
03:57 Nilesh_ joined #git
03:57 Emperor_Earth joined #git
04:02 gmacisme_ joined #git
04:02 chachasmooth joined #git
04:05 mostlybadfly joined #git
04:05 almy joined #git
04:07 m0viefreak joined #git
04:09 Tobbi joined #git
04:10 fstd_ joined #git
04:10 fstd_ joined #git
04:17 dreiss joined #git
04:23 dsdeiz joined #git
04:23 dsdeiz joined #git
04:25 FederationOfNULL joined #git
04:33 zzz_ joined #git
04:40 King_Hual joined #git
04:40 denimsoft joined #git
04:40 bronson joined #git
04:48 sarbs joined #git
04:52 mehola joined #git
04:53 mehola joined #git
04:54 mehola joined #git
04:55 re1 joined #git
04:55 mehola joined #git
04:56 mehola joined #git
04:58 mehola joined #git
04:59 anuxivm left #git
05:00 d^sh joined #git
05:02 sarbs joined #git
05:08 mizu_no_oto joined #git
05:10 mehola joined #git
05:12 [log] joined #git
05:13 linuxmodder joined #git
05:16 Milos_ joined #git
05:20 Limes_ joined #git
05:23 astrofog joined #git
05:30 skl joined #git
05:37 whatitdo joined #git
05:41 bronson joined #git
05:41 d1z joined #git
05:44 davimore_ joined #git
05:51 drbean_ joined #git
05:54 boombatower joined #git
05:56 flyingcharge joined #git
05:58 Cabanossi joined #git
06:01 flyingcharge Hi, I am new and wish to contribute. I would be grateful if someone could help me with a few pointers to get started.
06:01 netj joined #git
06:07 dirtyroshi joined #git
06:13 subhojit777 joined #git
06:17 Sigma joined #git
06:23 Sigma joined #git
06:25 d1z joined #git
06:26 clemf_ joined #git
06:28 dreiss joined #git
06:28 bannakaffalatta joined #git
06:29 krs93 joined #git
06:30 clemf joined #git
06:42 bronson joined #git
06:43 prg3 joined #git
06:47 LiMp^ joined #git
06:51 tango_ joined #git
06:51 ayogi joined #git
07:02 gmacisme_ joined #git
07:07 zefferno joined #git
07:11 dsdeiz joined #git
07:11 dsdeiz joined #git
07:19 gmacisme_ joined #git
07:20 davimore__ joined #git
07:28 BOBO joined #git
07:29 askb joined #git
07:36 gmacisme_ joined #git
07:36 moei joined #git
07:43 bronson joined #git
07:47 howdoi joined #git
07:49 dreiss joined #git
07:54 Mowgli joined #git
08:07 Lyqyd joined #git
08:19 skl have a question, im on branch A and i did, git rebase --onto B HEAD~1, but it rebased everything onto branch A, shouldn't that have rebased onto branch B ?
08:27 finalbeta joined #git
08:32 Isla_de_Muerte joined #git
08:34 cyphase joined #git
08:44 bronson joined #git
08:48 oskarkv joined #git
08:51 Vangelis joined #git
08:55 mehola joined #git
08:55 mehola joined #git
08:59 dsdeiz joined #git
08:59 dsdeiz joined #git
08:59 _ikke_ skl: --onto doesn't mean that branch B is being updated, it just acts as the new base
09:00 _ikke_ skl: It's the current branch that's being rebase
09:00 _ikke_ rebased
09:01 _main_ joined #git
09:02 _main_ joined #git
09:02 skl it's "onto" suppose to specify the branch to rebase onto, otherwise that parameter does nothing ?
09:02 Vgr joined #git
09:03 Vgr joined #git
09:04 zzz joined #git
09:05 __main__ joined #git
09:07 cdown joined #git
09:09 fbwnd joined #git
09:10 ayjay_t joined #git
09:13 dsantiago joined #git
09:13 youser joined #git
09:15 kryware joined #git
09:16 BrownBear joined #git
09:18 osse skl: Otherwise the onto branch is the same branch as the normal argument
09:18 kevleyski joined #git
09:20 skl ah so it takes "onto" uses that as the rebase but result ends up for whatever is currently checked out?
09:20 skl so you could techniquelly destroy the entire branch?
09:20 skl the contents of it
09:21 skl if none of the arguments take from the branch you are on?
09:28 svm_invictvs joined #git
09:30 vdv joined #git
09:31 overlord_tm joined #git
09:37 GT4066 joined #git
09:39 kryware joined #git
09:39 shubhnik joined #git
09:39 ayjay_t joined #git
09:40 _jan_ joined #git
09:45 bronson joined #git
09:46 _jan joined #git
09:52 vrlx joined #git
09:53 davimore joined #git
09:54 tojo joined #git
09:55 mehola joined #git
09:55 mehola joined #git
09:56 mehola joined #git
09:57 mehola joined #git
09:58 mehola joined #git
09:59 mehola joined #git
10:02 mehola joined #git
10:02 kexmex joined #git
10:03 zefferno joined #git
10:05 zefferno joined #git
10:06 t0by joined #git
10:06 t0by joined #git
10:11 stick-shift joined #git
10:12 whatitdo joined #git
10:15 ayogi joined #git
10:19 Lope joined #git
10:19 Lope how can I get the output of git-log without it being interactive?
10:19 satifant joined #git
10:21 bremner Lope: git --no-pager log
10:21 bremner or git log | cat
10:21 Lope bremner: thanks man!
10:24 catsup joined #git
10:26 catsup joined #git
10:27 chachasmooth joined #git
10:29 zzz joined #git
10:31 mehola joined #git
10:31 elsevero joined #git
10:39 Cwolf3D joined #git
10:40 mehola joined #git
10:44 skl left #git
10:45 bronson joined #git
10:47 dsdeiz joined #git
10:49 mehola joined #git
10:53 finalbeta joined #git
10:55 m1dnight_ joined #git
10:56 ayogi joined #git
10:58 mehola joined #git
11:02 cdown_ joined #git
11:06 BigG joined #git
11:15 FederationOfNULL joined #git
11:16 FederationOfNULL joined #git
11:16 kexmex joined #git
11:37 _ADN_ joined #git
11:42 joki joined #git
11:46 bronson joined #git
11:47 ayjay_t joined #git
11:48 King_Hual joined #git
11:49 leftriver46 joined #git
11:50 ertesx joined #git
11:51 diogenese joined #git
11:51 thiago joined #git
11:52 aavrug joined #git
11:54 inflames joined #git
11:55 davimore_ joined #git
11:59 robotroll joined #git
12:04 TomyLobo joined #git
12:05 almy joined #git
12:07 YuGiOhJCJ joined #git
12:08 EisNerd_ joined #git
12:10 [ADN] joined #git
12:21 aax joined #git
12:22 derk0pf joined #git
12:22 eizua joined #git
12:28 pks joined #git
12:32 mda1 joined #git
12:33 finalbeta joined #git
12:35 dsdeiz joined #git
12:35 dsdeiz joined #git
12:39 ayogi joined #git
12:40 buffffal00 joined #git
12:43 [ADN] joined #git
12:47 bronson joined #git
12:51 jost joined #git
12:54 rominron_ joined #git
12:56 ojdo joined #git
13:00 sdothum joined #git
13:01 sostenuto joined #git
13:06 sarbs joined #git
13:08 ChristopheT joined #git
13:15 Guest36318 joined #git
13:25 sarbs joined #git
13:25 Kehet joined #git
13:26 nanga joined #git
13:27 nanga joined #git
13:28 jnavila joined #git
13:28 guardian hello, is it possible to convert a full clone into a shallow clone? (or am I better of recloning as a shallow clone of depth 1) ?
13:28 buffal0 joined #git
13:29 Kehet joined #git
13:32 PioneerAxon joined #git
13:33 finalbeta joined #git
13:33 mizu_no_oto joined #git
13:35 Discovery joined #git
13:37 Tobbi joined #git
13:38 IlNominePatre joined #git
13:38 iresf joined #git
13:39 tmsmith joined #git
13:41 17WAAWKRA joined #git
13:44 cyan__ joined #git
13:46 buffffal00 joined #git
13:46 _ADN_ joined #git
13:48 bronson joined #git
13:49 iresf left #git
13:54 theoceaniscool joined #git
13:55 metachr0n joined #git
13:57 jimmyeatworld joined #git
13:57 overlord_tm joined #git
13:57 kexmex joined #git
14:00 Darcidride joined #git
14:02 [0xAA] joined #git
14:02 j416 re-cloning is easier
14:02 j416 (why do you need to convert it?)
14:03 [0xAA] joined #git
14:05 pickle_ joined #git
14:08 ghostlight joined #git
14:11 ayjay_t joined #git
14:14 manuelschneid3r joined #git
14:19 nikivi joined #git
14:20 buffal0 joined #git
14:23 moestevens joined #git
14:24 dsdeiz joined #git
14:24 dsdeiz joined #git
14:29 khfeng joined #git
14:29 khfeng_ joined #git
14:30 guardian save space
14:30 fbwnd joined #git
14:32 cdg joined #git
14:32 j416 how large is the repo anyway?
14:33 guardian 3.5G, openFrameworks
14:33 j416 freshly cloned?
14:35 j416 huh, so it seems. huge repo.
14:35 j416 200 MiB with --depth=1
14:37 pickle_ joined #git
14:41 j416 guardian: only 2 GiB freshly cloned, though
14:41 j416 guardian: you might benefit from running gc
14:43 [0xAA] joined #git
14:48 sarbs joined #git
14:49 bronson joined #git
14:54 robattila256 joined #git
14:55 Lea2 joined #git
14:57 cfoch joined #git
14:57 cfoch hi
14:57 cfoch Happy New Year!
14:57 cfoch Question: How can I get the folder created by "git clone" in bash?
14:59 CheckDavid joined #git
15:05 aavrug joined #git
15:12 dreiss joined #git
15:14 dsdeiz joined #git
15:14 finalbeta joined #git
15:17 guardian thanks j416
15:17 cdown joined #git
15:17 xaa__ joined #git
15:19 moestevens joined #git
15:22 mike_ joined #git
15:23 cdown joined #git
15:26 nickabbey joined #git
15:26 zeroed joined #git
15:26 zeroed joined #git
15:29 moestevens joined #git
15:31 ooia joined #git
15:35 moestevens joined #git
15:40 rewt joined #git
15:44 HateDread joined #git
15:45 HateDread Hi all. I wanted to change the content of a commit that's already been pushed (I know, I know, but it's a private repo so I'm not stepping on toes). I've interactively rebased, commit --amend the changes, and git rebase --continue. So far so good, but...
15:45 HateDread If I push this now, will my history have that commit changed and that's it, or will it be a new commit with some obvious branching etc?
15:46 HateDread I wanted to basically ninja-edit something and leave the appearance of the history intact
15:47 cfoch Hi
15:47 overlord_tm joined #git
15:48 t0by joined #git
15:49 HateDread Will a force push of that just overwrite history and leave it nice and clean?
15:50 cfoch how can I get in Bash, that if any command fails, my computer emits a sound with "spd-say"?
15:50 Vgr joined #git
15:50 bronson joined #git
15:50 cfoch I have read about "set -e" but I believe this command exits the program or not?
15:51 BlessJah HateDread: push never creates commit, so push --force-with-lease will replace old commits with new one
15:52 HateDread BlessJah: Right, so I see 12 commits I can pull, and 12 I can push (in something like SourceTree) after doing this, so I presume I'm just putting the new 12 (the change + the ones rebased off of that new commit) on top of the old 12, in-place?
15:52 BlessJah remember thou that it's not ninja-edit, run git cat-file -p <mew hash of ammended> - you will see hidden 'commiter' field
15:53 uu left #git
15:53 subhojit777 joined #git
15:53 HateDread That sounds like you'd need to be looking pretty closely
15:54 BlessJah it will be in-place, but other clones (i.e. you other computer) cannot simply pull, as it could reintroduce old commits
15:54 HateDread What would they have to do?
15:54 BlessJah commiter field is hidden, but tools shows you when author is different than commiter
15:54 HateDread It's my own commit, so I guess that will all match anyway?
15:55 BlessJah HateDread: fetch, cherry pick their commits on top of new 12 commits , or reset in case they have no new commits
15:56 BlessJah git fetch, git log, git reset --keep origin/master, git cherry-pick hash hash hash
15:56 HateDread Are there any better ways you can suggest for this? I basically mucked up a commit 12-deep in the history, all pushed. I could commit something to fix that, but then the original commit isn't atomic like the rest.
15:57 cagedwisdom joined #git
15:57 BlessJah it really depends, and with such a picky internet (Ilm on train) I won't help you unfortunately
15:58 HateDread Okay sure. I just meant very generally. New to Git, not sure if this is a 'no no' and it's better to just commit a fix this much later.
15:58 HateDread Thanks though.
15:58 BlessJah for public repo, just commit fix, for private, do whatever you want (rebase, commit fix or even squash)
15:58 unbalanced joined #git
16:00 BlessJah it depends on the number of that use your particular branch, if you are able to help
16:01 BlessJah them by going one by one and explaining why did you rebase and how to reset/cherry-pick, then its fine
16:01 BlessJah rule of thumb
16:02 HateDread Okay. Working 100% solo on the entire repo atm. Just figuring out how to back this thing up in case I destroy it. I guess a clone of it can be used to restore the remote, can't it? Since every repo is self-contained.
16:02 HateDread You'd just force-push back up to overwrite the broken things
16:03 bremner you'd only lose configuration (e.g. remotes, local branches)
16:03 BlessJah git branch name oldhash?
16:04 HateDread I have no branches atm. And only origin remote
16:04 BlessJah the worst thing that might happen when rebase-ing na dpushing with force is loosing a branch
16:04 HateDread Sorry, other than master branch ;)
16:04 HateDread Okay cool
16:04 BlessJah just create another branch using old hash, push it to remote and try not to overwrite new one
16:06 HateDread I just force pushed the result of the rebase and it all seems okay now. What a ride
16:06 d1z joined #git
16:06 BlessJah google think-like-a-git, less than 30m read, much confidence
16:07 HateDread Cool, thanks. I've only ever reset branches to undo most recent pushed commit, never something like this, and had heard horror stories
16:07 HateDread Thanks for your help, folks.
16:07 doener joined #git
16:07 BlessJah HateDread: after think like a git read about reflog
16:07 fbwnd joined #git
16:08 HateDread I've written those down
16:08 HateDread The only thing I don't like about this is bitbucket advertising on repo main page under 'recent activity' all of the deletions. But at least the commit history is tidy. A worthy trade.
16:09 HateDread Or maybe not - it's part of a portfolio. Wonder what an employer would think of that.
16:11 BlessJah if its task assigned during/before interview, they might or might not notice, if your own idea, they shouldnt care
16:12 HateDread Nah just my own project
16:13 mda1 joined #git
16:15 sLite joined #git
16:17 ayogi joined #git
16:17 Singmyr joined #git
16:20 upcj joined #git
16:21 tmsmith joined #git
16:25 perrier-jouet joined #git
16:29 aax joined #git
16:30 mentazoom joined #git
16:31 t0by joined #git
16:32 dviola joined #git
16:35 frobnic joined #git
16:35 d0nn1e joined #git
16:35 nikivi joined #git
16:38 shubhnik joined #git
16:39 aarobc joined #git
16:40 madewokherd joined #git
16:43 khfeng joined #git
16:43 khfeng_ joined #git
16:47 gtristan joined #git
16:48 pks joined #git
16:49 sparetire joined #git
16:49 [0xAA] joined #git
16:50 cfoch oh... no... wrong channel
16:51 bronson joined #git
16:53 webdev007 joined #git
16:54 khfeng joined #git
16:55 khfeng_ joined #git
16:57 _W_ joined #git
16:58 mehola joined #git
16:59 Nilesh_ joined #git
17:00 jimi_ joined #git
17:05 vuoto joined #git
17:06 altendky joined #git
17:07 cagmz joined #git
17:07 bcc joined #git
17:07 bcc joined #git
17:07 mehola joined #git
17:10 whatitdo joined #git
17:11 BSaboia joined #git
17:12 Lope left #git
17:13 bronson joined #git
17:13 [0xAA] joined #git
17:14 NeverDie joined #git
17:18 Bloo[m] joined #git
17:19 flyingcharge joined #git
17:20 Olipro_ joined #git
17:23 BeautifulBash joined #git
17:23 BeautifulBash I want to add a new library to cdnjs, how would I go about doing this without cloning the entire cndjs repo?
17:23 BeautifulBash Like, should I just do something like git init and add the directory structure needed to add the library I want and then submit a pull request for it to be merged with the cdnjs repo?
17:23 BeautifulBash How would something like this work? Or would I be best off doing a sparse checkout and exclude the libraries folder and just add my library form there
17:23 meadmoon joined #git
17:25 Guest14887 joined #git
17:32 jimmyeatworld joined #git
17:32 Kehet joined #git
17:34 Vgr_ joined #git
17:35 Vgr_ joined #git
17:35 Vgr_ joined #git
17:36 jnavila joined #git
17:36 buffal0 joined #git
17:37 steven_ joined #git
17:40 justanotheruser joined #git
17:40 nikivi joined #git
17:40 dendazen joined #git
17:40 mehola joined #git
17:43 pikajude joined #git
17:50 mehola joined #git
17:50 hahuang61 joined #git
17:50 clemf joined #git
17:51 robotroll joined #git
17:51 rewt joined #git
17:55 [cust] joined #git
17:57 ShekharReddy joined #git
17:57 Vampire0 BeautifulBash, you cannot issue a pull request if you simply create a new git repository. Your pull request must be made from a fork based on the repo you want to submit your PR to. I think your best bet will be a shallow clone and then a sparse checkout if you want to save download time and disk space
17:59 mehola joined #git
17:59 shubhnik joined #git
18:01 YuGiOhJCJ joined #git
18:02 nickabbey joined #git
18:02 theoceaniscool joined #git
18:03 duderonomy joined #git
18:05 rewt joined #git
18:06 buffffal00 joined #git
18:08 shgysk8zer0_ joined #git
18:08 mehola joined #git
18:08 ChristopheT joined #git
18:09 d1z joined #git
18:13 [0xAA] joined #git
18:13 jw4242 joined #git
18:14 duderonomy joined #git
18:14 bcc joined #git
18:14 bcc joined #git
18:16 cbreak BeautifulBash: just request a pull normally
18:16 cbreak instead of via some weird web UI
18:17 cbreak but I doubt many projects want to merge unrelated history
18:17 fbwnd joined #git
18:18 Tobbi joined #git
18:19 sarbs joined #git
18:22 Phrohdoh joined #git
18:22 buffal0 joined #git
18:22 denimsoft joined #git
18:22 Phrohdoh In the pre-push hook does anyone know of a way to get the filepath of the repo on disk that the hook is running for?
18:23 [cust] joined #git
18:27 mehola joined #git
18:27 SteffanW joined #git
18:27 leah2 is there a good way to mark some files for some time as unchanged, so git diff etc won't show them, git commit -a won't commit them, but git will not overwrite the changed contents?
18:29 tobiasvl leah2: a good way? no. !assume_unchanged
18:29 gitinfo leah2: git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
18:29 tobiasvl leah2: also !xy applies, and perhaps !config ?
18:29 gitinfo leah2: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
18:29 gitinfo leah2: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
18:30 tobiasvl although "for some time" confuses me. maybe --assume-unchanged could work for you in that case, as long as you're not completely reliant on it not being overwritten
18:30 leah2 well, we have a config file in our repo that needs to be changed for temporary reasons (dns move), and its annoying to have the changes show up everywhere
18:30 tobiasvl ok, then look at what gitinfo said about config files then
18:32 leah2 perhaps i'll just float a patch that changes it on top so long
18:36 [0xAA] joined #git
18:36 mehola joined #git
18:36 pbrewczynski joined #git
18:39 pks joined #git
18:45 mehola joined #git
18:49 Goplat joined #git
18:54 mehola joined #git
18:55 cagedwisdom joined #git
18:57 duderonomy joined #git
18:58 BlessJah Phrohdoh: git rev-parse --git-dir or --show-toplevel?
18:58 Phrohdoh That doesn't promise `git` is ran in the correct place, does it?
19:00 BlessJah git invoked from hooks is always able to tell where GIT_DIR and worktree are
19:00 Phrohdoh ok, thanks
19:01 BlessJah worktree may not exist in case of bare repo (but pre-commit isnt one of bare repo hooks)
19:04 mehola joined #git
19:06 duderonomy joined #git
19:07 theoceaniscool joined #git
19:13 [0xAA] joined #git
19:14 ratdeptrai joined #git
19:18 mehola joined #git
19:20 therealGent joined #git
19:25 svm_invictvs joined #git
19:26 bcc joined #git
19:26 bcc joined #git
19:27 hahuang61 joined #git
19:27 mehola joined #git
19:31 joqmos joined #git
19:31 grawity new qotd: "I'm still butthurt that Git won." – Larry McVoy
19:32 _ikke_ heh
19:33 _ikke_ He's the reason that git came to be
19:33 _ikke_ His paranoia
19:33 grawity http://minnie.tuhs.org/pipermai​l/tuhs/2017-January/007611.html
19:34 Tobbi joined #git
19:34 joqmos Hey! I'm wondering if there is a way to change past commit messages without rebasing everything onto the master branch.
19:35 _ikke_ nope
19:35 unbalanced joined #git
19:36 d1z joined #git
19:36 _ikke_ Changing the commit message changes the hash of the commit
19:36 _ikke_ that means everything that has a reference to the old hash needs to be updated (recursively)
19:36 grawity well, you don't have to rebase everything *onto the master branch*
19:36 grawity but you *do* need to rewrite the branch, in general
19:37 mehola joined #git
19:38 joqmos grawity: How can I do that? When I use rebase, every commit ends up in the master branch
19:39 grawity first check out the branch you're trying to rebase
19:40 joqmos grawity: done
19:41 Noldorin joined #git
19:44 mizu_no_oto joined #git
19:46 mehola joined #git
19:47 NeverDie joined #git
19:50 svm_invictvs joined #git
19:51 ljubak joined #git
19:53 buffal0 joined #git
19:57 fatalhalt joined #git
20:01 Chatter_-1 joined #git
20:01 Chatter_-1 this network is a bait/entrapment/sting platform doing law enforcement or vigilante work. (ETHICALLY CORRUPT)
20:01 mehola_ joined #git
20:05 weckstrom joined #git
20:06 nanga joined #git
20:09 BlessJah to be precise, there is nuclear option of filter branch - viable if ones wants to massively rewrite everything or avoid rebase messing with merge commits
20:12 pks joined #git
20:15 d1z joined #git
20:20 GavinMagnus joined #git
20:23 [gmi] joined #git
20:25 joqmos grawity: Is there a way to manually do what I'm trying to do? Like, remake each commit starting with the initial commit
20:27 ignarps joined #git
20:27 GavinMagnus left #git
20:28 aidalgol joined #git
20:28 mehola joined #git
20:33 tojo joined #git
20:35 mehola_ joined #git
20:35 d1z_ joined #git
20:38 NeverDie How do I add a git commit message with a body from the command line?
20:38 Xandaros joined #git
20:39 Atm0spher1c joined #git
20:42 Tobbi joined #git
20:43 [Saint] joined #git
20:44 SwiftMatt joined #git
20:45 pbrewczynski joined #git
20:53 mehola joined #git
20:55 bcc joined #git
20:55 bcc joined #git
20:58 Darren_ joined #git
20:59 DIDAVISION joined #git
20:59 ayjay_t joined #git
21:01 bcc joined #git
21:01 bcc joined #git
21:01 dsdeiz joined #git
21:02 DINOWILLIAM joined #git
21:04 mehola joined #git
21:04 bennofs joined #git
21:05 mehola_ joined #git
21:05 bennofs Hi, is there any reason why git checks for --allow-empty before executing pre-commit? Would there be any disadvantage to checking it after running pre-commit?
21:09 meadmoon joined #git
21:11 Seveas bennofs: the ordering doesn't matter, as pre-commit is not supposed to change what'll be committed.
21:12 bennofs Seveas: well, where would be a good place to change what'll be commit?
21:13 bennofs s/commit/committed
21:13 paws_ joined #git
21:13 bennofs Seveas: I have a pre-commit hook that fixes up whitespace.
21:18 Seveas pre-commit can abort if it finds errors, but can't "fix" anything, humans should.
21:18 Seveas (they could do so by running a script or something...)
21:18 AfroThundr joined #git
21:20 bennofs Seveas: I find it quite convenient to have pre-commit fix up trailing whitespace in the lines that I have changed. What's wrong with that?
21:21 bennofs having to run another script changes the sequence from just git commit to git commit; fix-whitespace; git commit again
21:21 bremner because scripts make mistakes
21:22 King_Hual joined #git
21:24 cornfeedhobo joined #git
21:24 Seveas and that's exactly why commit hooks are not supposed to change the commit
21:24 HoierM_ joined #git
21:25 cornfeedhobo i'm playing with global ignores and wondering if there is a way to do a relative ignore? like each repo i'll make will have the ide's .project folder or something
21:25 bennofs bremner: in that case, I still find it more convenient to review the changes the script made after committing (only 2 steps), rather than being interrupted during the commit process and having to "context switch" to the task of removing trailing whitespace before being able to continue with my commit
21:25 cornfeedhobo is this possible?
21:26 bennofs cornfeedhobo: if you specify /.project in a global gitignore file then that will ignore a directory/file called .project in the top directory of each git repository
21:28 mehola joined #git
21:28 hahuang61 joined #git
21:29 cornfeedhobo bennofs: hmmm, that's not working
21:32 tmsmith joined #git
21:40 cornfeedhobo yeah, no luck
21:41 bennofs cornfeedhobo: try git check-ignore --verbose .project   in a repo where you want to ignore .project
21:41 justanotheruser joined #git
21:42 snowkidind joined #git
21:43 cornfeedhobo bennofs: turns out a misunderstanding on my part. figured it out. thanks!
21:46 lightstalker joined #git
21:48 nowhere_man joined #git
21:49 m1dnight2 joined #git
21:51 WayToDoor joined #git
21:52 matsaman joined #git
21:52 buffal0 joined #git
21:53 bcc joined #git
21:53 bcc joined #git
21:57 nwkj86 joined #git
22:00 DieguezZ joined #git
22:02 nwkj86 joined #git
22:02 kadoban joined #git
22:02 isysd joined #git
22:03 FilipNortic_ joined #git
22:05 Darren_ joined #git
22:05 askb joined #git
22:11 jeffreylevesque joined #git
22:11 cagedwisdom joined #git
22:15 re1 joined #git
22:15 DanmerZ joined #git
22:19 dsantiago joined #git
22:19 menip joined #git
22:25 robattila256 joined #git
22:26 sammyo joined #git
22:28 DS01 Ptz, how can i clone a branch to the same repo but with different name without pushing it?
22:29 robattila256 joined #git
22:29 matsaman don't think 'clone' would ever also 'push'
22:30 DS01 I don't mean clone command option
22:30 DS01 I mean clone
22:30 t0by joined #git
22:30 matsaman you want to copy data from a branch on a repo into a separate local repo in a specific branch?
22:31 Random832 what do you mean 'without pushing it'
22:31 matsaman just make the branch, copy the data in, and continue form there
22:31 matsaman s/form/from
22:31 Random832 check out the remote/whatever branch you want to 'clone', then git checkout -b new-branch-name
22:31 DS01 Well I have a branch called makko, then i want to create a branch called makko2 which contains the same files of makko, but without cloning makko branch, checkout makko2 and then push
22:32 Random832 i don't understand what you mean by 'push'
22:32 matsaman so, you don't want the history to show that makko2 was sourced from makko?
22:32 DS01 Git push origin master
22:32 Random832 ...
22:32 DS01 Branch*
22:32 Random832 so you want to create a new branch *on the remote*?
22:32 DS01 Yes
22:32 Random832 ok that wasn't clear
22:32 GavinMagnus joined #git
22:33 DS01 Like a fork
22:33 Random832 you have to push, but you can do it in a single push command
22:33 DS01 How?
22:33 Orbitrix joined #git
22:33 Random832 like git push origin makko:refs/heads/makko2
22:33 DS01 Aww
22:33 DS01 Now i try
22:33 Orbitrix joined #git
22:34 robattila256 joined #git
22:34 Orbitrix joined #git
22:34 Random832 the only way to affect a remote's references is with the push command, but you don't necessarily need anything *else* but a push command
22:34 Aleric DS01: A branch is just a 'tag' (that automatically moves when you commit on it).. so your branch 'clone' is nothing but adding that new branch 'tag' to point to the same place as the old branch.
22:35 Aleric Nothing needs to be copied.
22:35 salamanderrake joined #git
22:36 Aleric And that brings us (well, me) to the question: why do you want this? It seem illogical to want to add that branch to a remote without pushing ;)
22:36 GavinMagnus left #git
22:37 bluepixe1 joined #git
22:38 DS01 I know
22:38 DS01 I'm a pro in git
22:40 Aleric I need a pro in m4... #m4 is dead :/
22:40 mizu_no_oto joined #git
22:41 DS01 Worked!
22:41 DS01 I said I'm a pro!
22:41 Aleric I suppose nobody here knows how I could conditionally 'execute' a macro? Ie m4_append(...). When that is expanded it appends something to a string macro, I only want it to do that when some condition is true :/.
22:42 DS01 I only know marco, not macro
22:47 newbie1 joined #git
22:49 dsdeiz joined #git
22:51 WayToDoor joined #git
22:54 guest joined #git
22:54 Aleric Duh, I figured it out... I'm using m4 as part of a configure.ac script and autoconf redefines elseif as m4_if, so my elseif() wasn't working :p.
22:55 shgysk8zer0_ joined #git
22:57 jonascj joined #git
22:58 robattila256 joined #git
23:01 fmeerkoetter joined #git
23:01 elsevero joined #git
23:05 unreal joined #git
23:09 justan0theruser joined #git
23:11 Noldorin joined #git
23:12 ratdeptrai joined #git
23:17 mizu_no_oto joined #git
23:21 Hess joined #git
23:21 Hess joined #git
23:21 dispatch3d joined #git
23:22 dispatch3d just created a branch of my repo on my local computer, from a clone, how do I push the new branch to the internet/github?
23:23 Aleric git push origin branchname
23:23 dispatch3d its giving me prereceived hook decline
23:24 bcc joined #git
23:24 bcc joined #git
23:24 dispatch3d I don't remember specifying any standards that it would be auto failing?
23:24 Aleric It doesn't say why it is declined?
23:24 dispatch3d gives an error, failed to push some refs?
23:25 dispatch3d I had files in there that are too big, could that be why?
23:25 [ADN] joined #git
23:25 Aleric http://stackoverflow.com/questions/7986139/git-er​ror-when-trying-to-push-pre-receive-hook-declined
23:26 dispatch3d yes I read that, I'm the one with a problem in the setup files
23:26 Aleric Reading that I suppose github declines files larger than 120 MB.
23:27 dispatch3d humm I'll try deleting those files
23:27 Aleric That seems reasonable :p.  I only put things in a git repository when I typed them; other things are generated and don't belong in a repo.
23:28 dispatch3d alright, and as I code is it common to constantly update your repo or branch?
23:28 dispatch3d or is it usually one big step at the end?
23:29 dispatch3d like right now I'm probably updating 20 files
23:29 hahuang61 joined #git
23:29 Aleric It's good (not necessarily common) to commit a lot and often locally - but only push that once you tested that it works.
23:30 dispatch3d ah ok, good was wondering
23:31 Aleric If the maintainer is a twit then they might be so moronic to want a "clean" git history though... in that cause you'd have to rebase and merge all your commits into a single one at the end... before pushing. Branches are your friend here too, I guess.
23:31 Aleric The reason you should commit often is only so that you have backups of what you had before you started messing up.
23:32 bronson joined #git
23:32 dispatch3d yeah I figured, I was using canopy to code so it lets me ctrl z quite a bit
23:32 dispatch3d still lost stuff occasionally
23:33 elsevero joined #git
23:34 Aleric For me it depends dramatically on what repository I work on (the upstream maintainer thus).
23:35 dispatch3d Just working on a udacity course right now, and I code at work but its mostly excel with a little bit of python, no github allowed for sure
23:35 mizu_no_oto joined #git
23:35 Aleric While working for px4/Firmware, I work a whole month and only once everything was perfect rebase everything into a single commit with an extended commit explanation (so the pull request review got easier).
23:36 Aleric Currently I'm working alone and use github to sync submodules between projects, and get this: https://github.com/CarloWood/ai-th​readsafe-testsuite/commits/master
23:36 Aleric %-)
23:38 Aleric I guess I haven't pushed in a while... that list is at least 40 commits longer now
23:38 dispatch3d I need to find some data sciency stuff to do after this udacity course
23:38 Aleric You mean you want to help me with my project? ;)
23:38 dispatch3d that thing looks to advanced for me
23:39 dispatch3d I'm a shitty coder compared to real coders
23:39 Aleric Oh ok.
23:39 dispatch3d this is C or C++?
23:39 Aleric Still wondering what in particular you looked at
23:39 Aleric C++
23:40 dispatch3d ai-threadsafe-testsuite
23:40 Aleric That's an empty shell with three git submodules :p
23:41 dispatch3d haha yeah briefly looking at your different repos
23:41 dispatch3d we kinda do different stuff
23:41 dispatch3d I'm trying to learn data science on python, your doing C++, chessboard maybe looks interesting
23:42 dispatch3d be neat to build ai for it
23:42 newbie1 joined #git
23:43 newbie1 joined #git
23:43 Aleric I wrote that years ago... I don't think anyone ever used it in an application :(
23:43 dispatch3d well all the cool ai stuff is done in python
23:43 dispatch3d I thought c++ was used for systems stuff
23:44 Aleric You mention ai because some repositories start with ai?  There is no A.I. in my code.
23:44 Aleric (or anywhere in the world imho)
23:45 dispatch3d nah ai is an interest of mine, i figured a chess board could use some sorta vs computer mode
23:46 Aleric A.I. are my initials :p.. Although yes, I picked this pseudonym because of that fact.  It's really a pseudonym that I used for Second Life; Aleric is a character of a book that can teleport himself to place he's been before, and my autism and intelligence often make me appear like an A.I. :p
23:47 TyrfingMjolnir joined #git
23:47 dispatch3d haha
23:47 Aleric I like A.I. too, but I think that humanity isn't anywhere even close to approaching real intelligence.
23:47 dispatch3d so is it as simple as deleting those files
23:47 TyrfingMjolnir I have cloned a repo to my local workspace using git clone, added some files using cp, how do I push this back to the repo on github?
23:47 dispatch3d or do i have to change my add for the  commit?
23:47 Aleric You might have to get rid of the commit itself.
23:48 dispatch3d ah how do I do that
23:48 Aleric Is it the last commit?
23:48 dispatch3d tyrf's question is similar to what I'm doing now
23:48 dispatch3d yes
23:48 Aleric git reset --soft HEAD~1
23:48 Aleric maybe?
23:49 Aleric basically, put your branch pointer back to HEAD~1 without changing your working directory.  Then the commit is gone.
23:49 dispatch3d think it worked
23:49 Aleric git branch still master?
23:49 Aleric 'git branch'
23:49 bennofs left #git
23:49 TyrfingMjolnir Aleric: Intelligence is not in a computer; real intelligence is nerves and stuff like that.
23:50 Aleric Tyrfing: I once came up with a definition of intelligence... that definitely can include computer... one day.
23:50 TyrfingMjolnir Aleric: perhaps read about plasticity
23:51 TyrfingMjolnir Whatever has intelligence must have the ability to change itself.
23:51 Aleric https://medium.com/@alericinglewood/the-​definition-of-intelligence-252136654f8f#.f8p2eyd7b
23:51 dispatch3d git branch is currently computerbranch
23:54 Aleric Anyway, I'm currently making my PC 'intelligent' by completely automatically deal with git submodules :p
23:54 Raed joined #git
23:55 NeverDie joined #git
23:55 dispatch3d the files I copied over that are new to the branch didn't get uploaded
23:55 dispatch3d yet they are in the folder
23:56 dispatch3d should git add * take care of that?
23:56 Samual joined #git
23:56 Samual joined #git
23:56 brent_ joined #git
23:56 Aleric You wanted to delete them, so no.
23:56 Aleric If you git add them then you're going to commit them again, and they are too large
23:56 TyrfingMjolnir I have cloned a repo to my local workspace using git clone, added some files using cp, how do I put this back to the repo on github?
23:56 dispatch3d there are other files in there that are not too big
23:57 debian_ joined #git
23:57 Aleric Well, yes... you have to re-add everything (except the large files) and redo the commit
23:58 Aleric Tyr: UNIX cp ?
23:59 Aleric git add FILES... ; git commit -m 'Added new files.' ; git push origin master ;  read about git online... not necessarily in that order.
23:59 TyrfingMjolnir Aleric: yes unix cp

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