Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-31

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

All times shown according to UTC.

Time Nick Message
00:00 khagler joined #git
00:01 g5pw joined #git
00:02 weiyang joined #git
00:06 jw4242 joined #git
00:07 LiMp^ joined #git
00:08 Cwolf3D joined #git
00:12 howitdo joined #git
00:15 bronson joined #git
00:17 dsdeiz joined #git
00:17 dsdeiz joined #git
00:20 theoceaniscool joined #git
00:21 gtristan joined #git
00:21 gmacisme joined #git
00:25 jottr joined #git
00:27 mns joined #git
00:31 mehola joined #git
00:35 julius joined #git
00:35 julius hi
00:36 julius ive got a local git directory initialized by netbeans, ive run the commands: git remote add origin andromeda:/home/julius/code/java/ajaxguessnumber   and git push origin master         the second gives me: error: src refspec master does not match any
00:36 julius what is git telling me?
00:38 gmacisme_ joined #git
00:38 Darcidride joined #git
00:45 Bob joined #git
00:46 imachuchu julius: do you have a branch called master in your repo?
00:46 Atrumx joined #git
00:47 ochorocho__ joined #git
00:49 Balliad joined #git
00:51 remote left #git
01:01 Aleric joined #git
01:06 Aleric Hi, can someone help me to fix this deadlock: http://codepad.org/Z34hIUkN
01:06 Aleric git is telling me it can't push because a submodule isn't pushed.. but it is. No idea why it is complaining :/
01:10 Byter joined #git
01:11 Aleric Seem that git is just broken. When I do: git submodule foreach 'echo $sha1'
01:11 HoierM_ joined #git
01:12 Aleric It prints the same SHA1 as 'git show' reports inside utils/ for local and the remote...
01:13 mizu_no_oto joined #git
01:16 fstd joined #git
01:16 bronson joined #git
01:23 fstd joined #git
01:29 fstd joined #git
01:29 sweatsuit joined #git
01:37 kadoban joined #git
01:38 jnewt joined #git
01:49 guzzlefry joined #git
01:50 guzzlefry I just renamed a directory full of code. Is there any way to double-check that no code changes were accidentally committed?
01:52 xaviergmail joined #git
01:52 matsaman joined #git
01:54 andrew710 joined #git
02:01 Eryn_1983_FL joined #git
02:03 andrew710 joined #git
02:06 thiago guzzlefry: git whatchanged -M should list everything as rename
02:07 amikiri joined #git
02:07 menip joined #git
02:08 guzzlefry thanks
02:12 ToBeCloud joined #git
02:13 the_cybersphinx joined #git
02:13 guzzlefry left #git
02:15 aw1 joined #git
02:16 howitdo joined #git
02:16 howitdo joined #git
02:17 pks joined #git
02:17 bronson joined #git
02:20 the_cybersphinx joined #git
02:21 marouane joined #git
02:21 unreal_ joined #git
02:25 d^sh joined #git
02:26 floatingman joined #git
02:27 finalbeta joined #git
02:27 kysjpqkskyfymgdo joined #git
02:29 fatalhalt joined #git
02:32 dsdeiz joined #git
02:34 the_cybersphinx joined #git
02:40 fstd joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | 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 | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:48 ochorocho__ joined #git
02:53 looper joined #git
03:02 Vampire0_ joined #git
03:04 thiago joined #git
03:10 snowkidind joined #git
03:11 [log] joined #git
03:17 r00twrh joined #git
03:18 bronson joined #git
03:19 Limes_ joined #git
03:20 xaviergmail joined #git
03:21 zacts joined #git
03:33 hexagoxel joined #git
03:35 coasterz joined #git
03:35 eehackr joined #git
03:37 bannakaffalatta joined #git
03:48 sunri5e joined #git
03:48 Goplat joined #git
03:48 Tobarja joined #git
03:49 mizu_no_oto joined #git
03:58 Lyqyd joined #git
03:58 Vortex35 joined #git
03:58 shinnya joined #git
03:59 jeffreylevesque joined #git
04:01 chachasmooth joined #git
04:04 andrew710 joined #git
04:08 NeverDie joined #git
04:13 fstd joined #git
04:13 dirtyroshi joined #git
04:15 shgysk8zer0_ joined #git
04:16 ignarps joined #git
04:17 cagmz joined #git
04:18 cagmz joined #git
04:18 bronson joined #git
04:19 cagmz joined #git
04:27 NeverDie_ joined #git
04:29 arescorpio joined #git
04:29 PioneerAxon joined #git
04:34 ignarps joined #git
04:34 duderonomy joined #git
04:40 PioneerAxon joined #git
04:41 aidalgol joined #git
04:44 ignarps joined #git
04:44 dsdeiz joined #git
04:49 ochorocho__ joined #git
04:50 Nilesh_ joined #git
05:04 [0xAA] joined #git
05:05 [0xAA] joined #git
05:09 ignarps joined #git
05:09 AfroThundr joined #git
05:10 fstd joined #git
05:18 fstd joined #git
05:19 _xor joined #git
05:20 bronson joined #git
05:22 dreiss joined #git
05:28 ajf- joined #git
05:28 nd- joined #git
05:30 pks joined #git
05:31 ignarps joined #git
05:43 bocaneri joined #git
05:47 svm_invictvs joined #git
05:58 Cabanossi joined #git
06:10 Tanfrieze joined #git
06:11 subhojit777 joined #git
06:11 dsdeiz joined #git
06:15 gmacisme_ joined #git
06:16 AfroThundr joined #git
06:17 AfroThundr joined #git
06:18 ignarps joined #git
06:20 bronson joined #git
06:21 Atm0spher1c joined #git
06:25 robotics joined #git
06:29 Atm0spher1c joined #git
06:32 jagob joined #git
06:35 ignarps joined #git
06:36 oaaao joined #git
06:37 cyan__ joined #git
06:39 amikiri joined #git
06:40 ignarps joined #git
06:44 cyan__ joined #git
06:49 ignarps joined #git
06:50 ochorocho__ joined #git
06:51 guyz joined #git
06:58 shubhnik joined #git
07:03 dreiss joined #git
07:04 Derperperd joined #git
07:05 Pseudocrat joined #git
07:11 overlord_tm joined #git
07:17 robnester joined #git
07:21 bronson joined #git
07:22 a_thakur joined #git
07:22 a_thakur joined #git
07:22 aarobc joined #git
07:30 PioneerAxon joined #git
07:34 howitdo joined #git
07:35 FederationOfNULL joined #git
07:35 justanotheruser joined #git
07:35 FederationOfNULL joined #git
07:43 PioneerAxon joined #git
07:44 zzz joined #git
08:06 wuiney joined #git
08:08 pks joined #git
08:09 wogi joined #git
08:09 oskarkv joined #git
08:10 stick-shift joined #git
08:22 bronson joined #git
08:29 zzz joined #git
08:33 asfd221 joined #git
08:36 khfeng joined #git
08:36 marouane joined #git
08:39 cagedwisdom joined #git
08:43 vdv joined #git
08:44 byte512 joined #git
08:44 asfd221 I cloned a git pack of ubuntu-precise source code but I do not know how to use/access it. Will any one help me (i was told you people are kind:))
08:48 kexmex joined #git
08:51 ochorocho__ joined #git
08:52 asfd221 Can anyone see what I am posting?
08:54 nwkj86 joined #git
08:58 JanC_ joined #git
08:58 asfd221 left #git
09:03 narendraj9 joined #git
09:04 zzz joined #git
09:06 wuiney joined #git
09:12 t0by joined #git
09:15 aw1 why was stash invented when one can do a temporary commit and reset it easily?
09:23 bronson joined #git
09:24 variable joined #git
09:24 variable I have a bunch of submodules I want to update like
09:24 variable git submodule foreach git pull --rebase origin master
09:24 variable but for one of them I want a branch other than "master"
09:25 variable other than making the foreach thing more complex that checks $path
09:25 variable is there some way for me to store the branch in git?
09:27 variable iow atm the submodule gets stored by hash rather than by branch, which makes sense, but I want some way to store in git which branch future changes should come from
09:33 denimsoft joined #git
09:33 theanyotherkey joined #git
09:35 theanyotherkey why am i getting many 7.8M binaries in libexec  for all the git-* things ?
09:35 osse theanyotherkey: Hardlinks to git. They don't actually take up that much space
09:36 osse variable: You can make a submodule use a branch instead of a specific commit.
09:36 unborn left #git
09:37 variable osse: two questions: (a) how? and (b) If I want to pin to a sha, but also "track an upstream branch" is that possible?
09:38 osse variable: Don't know, and probably not, respectively. For the former look in man git-config. For the latter, would it be an alternative to check the branch out in the submodule, so that your pull would update that one instead of master?
09:38 gitinfo variable: the git-config manpage is available at http://jk.gs/git-config.html
09:38 howdoi joined #git
09:38 variable looking
09:39 variable tyvm
09:39 theanyotherkey osse: oh my install script must have messed something up, i'm getting different inode's and stat telling me they're regular files
09:40 osse theanyotherkey: how many are there?
09:40 osse theanyotherkey: Some of them are actually different binaries, such as git-httpsomething, but most of them shouldn't be.
09:41 theanyotherkey yeah that one is smaller, there are many duplicates
09:41 osse variable: submodule.name.branch maybe
09:41 variable theanyotherkey ∴find . -depth 1 -exec stat {}
09:41 variable osse ty
09:41 glebihan joined #git
09:42 variable theanyotherkey or more specifically ∴find . -depth 1 -exec stat {} +
09:42 King_Hual joined #git
09:42 osse how about ''stat *'' ? :)
09:43 theanyotherkey variable:  what's my goal here, i think i need to be checking for links in my build/install script before i copy these files
09:44 variable osse find . -type d -maxdepth 1  -exec "find {} -type f -depth 1 "....
09:44 variable :-)
09:44 osse theanyotherkey: What os?
09:44 theanyotherkey linux
09:45 osse There is perhaps also the option of doing make NOLINKS=1 install. Search the comments at the top of the makefile
09:46 theanyotherkey i don't see that git-2.11.0
09:46 theanyotherkey from github because the website has no proper tarball link
09:47 theanyotherkey :|
09:47 variable a git repo I regularly work with:11G .git; 4G on top of that
09:47 variable for the workdir
09:47 variable :/ :/
09:48 subhojit777 joined #git
09:50 theanyotherkey ok the inodes are the same, i must have just picked another set of dupes
09:50 theanyotherkey 114 links on this one,  theres some with 4, and 6
09:53 mehola joined #git
09:53 danslo joined #git
09:53 theanyotherkey does tar not handle hard links well or something?
09:55 theanyotherkey the way i'm tarring the files it's producing over 400MB tar/gzip
09:55 theoceaniscool joined #git
10:00 Peng tar should be fine
10:01 celebre joined #git
10:02 mehola joined #git
10:02 marouane joined #git
10:03 theanyotherkey tar -czvf test.tar.gz /usr/libexec/git-core is creating 400+MB file
10:04 elsevero joined #git
10:06 dsdeiz joined #git
10:07 mablae joined #git
10:09 xaa joined #git
10:11 mehola joined #git
10:13 Balliad joined #git
10:13 nitesh joined #git
10:13 nitesh` joined #git
10:14 howitdo joined #git
10:14 ochorocho__ joined #git
10:15 aw1 joined #git
10:16 whatitdo joined #git
10:17 mehola joined #git
10:17 almy joined #git
10:22 theanyotherkey only thing wierd i can think of is the rootfs those hardlinks are one is ext2, though /proc/mounts thinks it's ext4 for some reason
10:24 pbrewczynski joined #git
10:24 bronson joined #git
10:26 mehola joined #git
10:26 tvw joined #git
10:35 re1 joined #git
10:36 clemf joined #git
10:38 celebre joined #git
10:39 theanyotherkey oooh figured it out, it was my dumb script destroying the link-ness by not using cp with -a   doh!
10:39 theanyotherkey thanks for sanity check, yalls
10:40 mehola joined #git
10:41 robotroll joined #git
10:44 diogenese joined #git
10:44 re1 joined #git
10:50 _jan joined #git
10:53 hagridaaron joined #git
10:53 mehola joined #git
10:55 mizu_no_oto joined #git
10:57 _ADN_ joined #git
10:59 mehola joined #git
10:59 YuGiOhJCJ joined #git
11:00 joki joined #git
11:02 Cwolf3D joined #git
11:03 narendraj9 joined #git
11:06 khfeng joined #git
11:08 mehola joined #git
11:17 mehola joined #git
11:19 dodobrain joined #git
11:20 mgoodwin If a commit errors out due to a pre-commit hook, does the message persist anywhere ?
11:20 mgoodwin I took the time to type out a long message and then a pre-commit hook checking for user.email failed and aborted the commit :(
11:22 mehola joined #git
11:23 Balliad joined #git
11:25 bronson joined #git
11:27 Balliad_ joined #git
11:31 mehola joined #git
11:32 cyan__ joined #git
11:33 Puffball joined #git
11:34 grawity mgoodwin: try .git/COMMIT_MSG
11:34 grawity or, .git/COMMIT_EDITMSG in some cases
11:35 mgoodwin Nope, those don't exist, and I thought later to grep for a unique phrase and that didn't find anything either. Looks like I'm hosed.
11:36 khfeng joined #git
11:36 mgoodwin It turns out it's a bug in the current plugin i'm using for atom; that is, git itself does a pre-commit hook _before_ asking for a message as it should, whereas this plugin asks for the message, save, window disappears, then error message appears and commit and message are lost.
11:36 mgoodwin I'm filing a bug with them now
11:36 joki joined #git
11:41 mehola joined #git
11:49 satifant joined #git
11:51 vrlx joined #git
11:51 ertesx joined #git
11:51 robattila256 joined #git
11:52 d0nn1e joined #git
11:54 aavrug joined #git
11:54 mehola joined #git
11:56 davimore_ joined #git
12:00 NwS joined #git
12:00 filcab joined #git
12:02 jnavila joined #git
12:03 sea-gull_ joined #git
12:03 netj joined #git
12:03 khfeng joined #git
12:04 mda1 joined #git
12:08 Spec-Chum joined #git
12:14 Zialus joined #git
12:15 donught joined #git
12:15 amikiri joined #git
12:16 zefferno joined #git
12:17 Jackneill joined #git
12:19 shubhnik joined #git
12:20 stick-shift joined #git
12:21 Tobbi joined #git
12:21 cdg joined #git
12:22 celebre joined #git
12:23 inovas joined #git
12:23 khfeng_ joined #git
12:25 mentazoom joined #git
12:26 bronson joined #git
12:27 mehola joined #git
12:30 m0viefreak joined #git
12:32 hagridaaron joined #git
12:36 jnavila joined #git
12:41 Guest14887 joined #git
12:41 mehola joined #git
12:42 Jackneill joined #git
12:43 ochorocho__ joined #git
12:49 dsdeiz joined #git
12:50 mehola joined #git
12:51 netj joined #git
12:52 sdothum joined #git
12:57 ojdo joined #git
12:58 almy joined #git
13:00 mehola joined #git
13:01 GT4066 joined #git
13:05 shubhnik joined #git
13:05 sea-gull_ joined #git
13:09 stick-shift joined #git
13:10 dodobrain joined #git
13:12 kexmex joined #git
13:14 Vinnie_win_q joined #git
13:22 netj joined #git
13:26 Spec-Chum joined #git
13:26 bronson joined #git
13:28 mehola joined #git
13:30 stick-shift joined #git
13:30 de-vri-es joined #git
13:30 TheWild joined #git
13:30 TheWild hello
13:31 TheWild why doesn't git have a --json option. It would be easier for other applications to communicate with git.
13:32 TheWild git log --json for example
13:32 jost joined #git
13:33 BlessJah there are git implementations and/or libraries in several languages, and some git commands provide porcelain output meant for scripting
13:34 Jackneill joined #git
13:35 BlessJah also, there are lots of so called plumbing commands, which are what you probably use instead
13:38 BlessJah I've seen attempt to have SQL-like query interface for git
13:39 gzhang joined #git
13:40 BlessJah TheWild: while json output might make sense, the log command isn't the best one to be json, and the commands that would benefit from json are usually already easily parsable
13:41 thiago TheWild: the plumbing commands are all parseable
13:41 thiago no JSON needed
13:41 TheWild It doesn't have to be json, just something easily parseable (end escaped properly when needed... I mean when " was used as string delimiter, " should be represented withing a string by some other non-direct way).
13:42 thiago better: it outputs in binary with size prefixed
13:43 thiago use git rev-list to get your commit IDs, and use git cat-file --batch to get the logs
13:46 shubhnik joined #git
13:48 TheWild looks like "plumbing" was the key word. I've found a bunch of commands over the internet and checking them out while reading the help.
13:48 TheWild thank you BlessJah and thiago.
13:48 BlessJah !reference
13:49 BlessJah no references? !docs
13:49 gitinfo [!doc] A list of useful documentation of all kinds is here:  http://git-scm.com/documentation -- or try the wiki at  http://git.wiki.kernel.org/.  Also try typing "!book" "!cs" "!bottomup"  "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC.  !book is probably the most helpful.
13:50 BlessJah TheWild: check out reference at git-scm. reference lists all commands, those unknown to you or multiple-words-with-dashes are probably pllumbing (rev-prase, cat-file etc)
13:51 mkoskar joined #git
13:52 ileif joined #git
13:53 sonOfRa joined #git
13:54 Vampire0 BlessJah, TheWild: even better, man git lists all commands and categorizes them in porcellain and various plumbing subcategories like interrogation, manipulation, interaction, ...
13:54 gitinfo BlessJah: the git manpage is available at http://jk.gs/git.html
13:54 TheWild hah, nice description ;)
13:55 TheWild (meant, "name" section)
13:55 Vampire0 :-)
13:56 Vampire0 Description of git by a git :-D
13:56 mehola joined #git
14:02 Jackneill joined #git
14:04 Arguggi joined #git
14:04 Singmyr joined #git
14:05 TheWild with git rev-list --all I can list all commits and with --parents I can even construct a tree. However, I can't find a way to obtain commit messages.
14:06 moritz TheWild: with --pretty you can
14:06 celebre joined #git
14:08 TheWild moritz, thanks. Although the format is now more human-readable, it's still parseable by machine.
14:09 elsevero joined #git
14:09 mehola joined #git
14:13 theoceaniscool_ joined #git
14:14 thiago TheWild: feed the commit to git cat-file --batch
14:15 mehola joined #git
14:15 thiago in fact, the output of cat-file contains the parent commits, so you can construct the tree from that, without rev-list
14:17 buzzLightBeer joined #git
14:23 jnavila joined #git
14:24 mehola joined #git
14:25 ToBeCloud joined #git
14:26 shubhnik joined #git
14:26 jorxw joined #git
14:28 bronson joined #git
14:28 dave0x6d joined #git
14:33 mehola joined #git
14:38 TheWild git rev-list --all | git cat-file --batch
14:38 celebre joined #git
14:39 TheWild I don't know whether "da39a3ee5e6b4b0d3255bfef95601890afd80709 commit 123" is next commit or continuation of message from current commit.
14:39 Balliad joined #git
14:40 tvw joined #git
14:41 xaviergmail joined #git
14:42 cdown joined #git
14:42 mehola joined #git
14:43 ayjay_t joined #git
14:43 tojo joined #git
14:45 buffal0 joined #git
14:46 mmattice joined #git
14:50 dar123 joined #git
14:53 mentazoom joined #git
14:56 mehola joined #git
14:57 thiago joined #git
14:57 thiago TheWild: it is the SHA-1 that you asked, the type, then the length
14:57 leftriver55 joined #git
14:58 amikiri joined #git
15:01 TheWild oh, the last field is the length. Darn I thought it's some kind of commit number.
15:01 leftriver55 I want to quit from this state "master|MERGING" (to which I don't know how I get and what it is) `~/workspace/google-homepage (master|MERGING) $`
15:02 TheWild checked and this field matches the length of the remaining data. Thanks thiago.
15:03 leftriver55 when in google I've typed "how to quit (master|MERGING)" it gives me "How to Stop a Masturbation Addiction: 9 Steps (with Pictures)" :D
15:04 Iye joined #git
15:05 thiago leftriver55: git merge --abort
15:06 mehola joined #git
15:12 leftriver55 Thanks Thiago. Partially it worked
15:14 jast what's missing?
15:14 Emperor_Earth joined #git
15:15 Noldorin joined #git
15:19 inovas joined #git
15:20 mehola joined #git
15:22 cdown_ joined #git
15:23 tmsmith joined #git
15:24 test222 joined #git
15:25 leeN joined #git
15:25 SuperSeriousCat joined #git
15:26 Slush-_ left #git
15:26 test222 left #git
15:26 Slush- joined #git
15:27 amikiri joined #git
15:28 bronson joined #git
15:29 kexmex joined #git
15:34 mehola joined #git
15:39 Koutu joined #git
15:41 nwkj86 joined #git
15:42 SuperSeriousCat joined #git
15:43 SuperSeriousCat joined #git
15:44 Jon28 joined #git
15:44 cdown joined #git
15:48 mehola joined #git
15:48 SuperSeriousCat joined #git
15:51 dviola joined #git
15:51 dreiss joined #git
15:55 snowkidind joined #git
15:56 CheckDavid joined #git
15:56 mizu_no_oto joined #git
15:58 aavrug joined #git
15:59 shgysk8zer0_ joined #git
15:59 caulagi joined #git
16:01 aavrug joined #git
16:03 caulagi hello - what am I missing here?
16:03 caulagi http://dpaste.com/0Z0368T
16:04 kus joined #git
16:13 Balliad joined #git
16:14 caulagi nvm, i needed  export GPG_TTY=$(tty)
16:14 aavrug joined #git
16:14 Nilesh_ joined #git
16:23 xaviergmail joined #git
16:25 unreal joined #git
16:29 bronson joined #git
16:31 stick-shift joined #git
16:31 buffal0 joined #git
16:31 mmattice joined #git
16:33 anuxivm joined #git
16:33 amikiri joined #git
16:33 pasky joined #git
16:34 YuGiOhJCJ joined #git
16:36 Darren_ joined #git
16:37 yuri__ joined #git
16:38 BlessJah @y
16:39 lightstalker joined #git
16:39 Sleepy63 joined #git
16:39 mehola joined #git
16:44 TheWild about git cat_file: what is the format of author and commiter? Can't find documentation for this.
16:46 aax joined #git
16:47 kexmex joined #git
16:48 dendazen joined #git
16:49 Derperperd joined #git
16:50 dreiss joined #git
16:51 d1z joined #git
16:53 mehola joined #git
16:54 jost joined #git
16:55 d1z In a merge process between A and B, is it valid to say that B merges into A (A <- B) or that A merges into B (A -> B). Or is merging A and B the exact same thing as merging any of them to the other no matter the order?
16:55 gajus joined #git
16:58 BrownBear joined #git
16:58 joco42 joined #git
17:00 celebre joined #git
17:00 grawity parents 2..n (the command-line args to `git merge`) merge into parent 1 (the previous HEAD)
17:00 Pulp joined #git
17:00 grawity the result might or might not be the same, depending on the merge strategy being used
17:05 Sleepy63 joined #git
17:06 perrier-jouet joined #git
17:07 weylin joined #git
17:07 mehola joined #git
17:10 whatitdo joined #git
17:11 mehola_ joined #git
17:11 aarobc joined #git
17:14 thiago d1z: the result is the same. The only difference is which branch gets updated.
17:14 thiago if you checkout A and merge B, A gets updated
17:20 xaa__ joined #git
17:25 Puffball joined #git
17:25 cagmz joined #git
17:25 nwkj86 joined #git
17:26 zzz joined #git
17:27 psyb0t joined #git
17:29 ayjay_t joined #git
17:30 bronson joined #git
17:37 aavrug joined #git
17:38 cdown joined #git
17:43 aavrug_ joined #git
17:43 psyb0t joined #git
17:45 Mowgli joined #git
17:46 dave0x6d joined #git
17:51 ayogi joined #git
17:53 kadoban joined #git
17:59 shubhnik joined #git
18:00 gtristan joined #git
18:00 Vortex34 joined #git
18:01 anuxivm left #git
18:06 Tobbi joined #git
18:08 therealGent joined #git
18:08 therealGent joined #git
18:09 shams joined #git
18:15 shams joined #git
18:17 ajf- joined #git
18:19 duderonomy joined #git
18:22 aax joined #git
18:23 idlemind joined #git
18:23 buffal0 joined #git
18:24 cdown_ joined #git
18:27 tojo joined #git
18:27 siddart joined #git
18:29 shubhnik joined #git
18:31 bronson joined #git
18:33 GeekMan joined #git
18:34 Hess joined #git
18:40 silnp joined #git
18:45 kyan joined #git
18:45 Goplat joined #git
18:46 jw4242 joined #git
18:49 ajf- joined #git
18:50 Rosco_y joined #git
18:53 theoceaniscool joined #git
18:56 cagedwisdom joined #git
18:58 psyb0t joined #git
18:58 cdg joined #git
18:58 safe joined #git
18:59 Jonuz joined #git
19:00 dweelie joined #git
19:04 SteffanW joined #git
19:10 Tobbi joined #git
19:12 HoierM_ joined #git
19:14 chachasmooth joined #git
19:14 heroux joined #git
19:17 nicksloan joined #git
19:18 Orbitrix joined #git
19:18 xaviergmail joined #git
19:18 Orbitrix joined #git
19:19 unbalanced joined #git
19:20 tojo joined #git
19:24 madewokherd joined #git
19:25 Cassiopaya joined #git
19:26 [log] joined #git
19:31 justanotheruser joined #git
19:32 bronson joined #git
19:32 nwkj86 joined #git
19:38 romerocesar joined #git
19:40 robotroll joined #git
19:52 buffal0 joined #git
19:59 v-y left #git
20:00 nanga joined #git
20:00 nanga joined #git
20:00 kexmex joined #git
20:01 buffal0 joined #git
20:03 mehola joined #git
20:08 jorj joined #git
20:09 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
20:10 dsdeiz joined #git
20:10 dsdeiz joined #git
20:16 JanC_ joined #git
20:21 AfroThundr joined #git
20:22 MSF joined #git
20:22 AfroThundr joined #git
20:27 mizu_no_oto joined #git
20:28 MSF left #git
20:28 Jackneill joined #git
20:32 cdown joined #git
20:33 bronson joined #git
20:33 synthmeat left #git
20:34 cdown_ joined #git
20:37 cdown joined #git
20:40 the_cybersphinx joined #git
20:42 kevleyski joined #git
20:46 cdown joined #git
20:49 vrlx joined #git
20:53 dmc joined #git
20:59 Guest50191 left #git
21:01 weylin joined #git
21:02 HM left #git
21:04 shpew12 joined #git
21:05 rindolf joined #git
21:06 shpew12 I'm trying to clone a repository on my server. For some reason, I can clone it to a different directory on my server, but if I try to clone it locally, it doesn't recognize it as a git directory. Does anyone know why that might be?
21:07 wuiney joined #git
21:07 rindolf shpew12: what is the git command?
21:07 troulouliou_dev joined #git
21:08 shpew12 git clone http://etc...
21:08 weylin joined #git
21:08 rindolf shpew12: ah, does it give an error?
21:08 rindolf shpew12: did you cd into the sub-dir?
21:10 shpew12 fatal: http://etc../info/refs/ not valid
21:11 shpew12 we just started using gitlist, maybe that has something to do with it?
21:11 rindolf shpew12: I don't have experience with the git web service
21:11 whatitdo joined #git
21:14 shpew12 It shouldn't affect the repositories though, it's just used to display them on the web, but I'll investigate it more
21:18 clemf joined #git
21:20 mizu_no_oto joined #git
21:25 pikajude joined #git
21:26 pikajude joined #git
21:28 mizu_no_oto joined #git
21:30 dduncan joined #git
21:30 dduncan left #git
21:32 Atm0spher1c joined #git
21:34 bronson joined #git
21:35 sarbs joined #git
21:35 dirtyroshi joined #git
21:36 a3Dman joined #git
21:39 GGMethos joined #git
21:39 aidalgol joined #git
21:41 tojo joined #git
21:47 wcpan joined #git
21:47 sea-gull_ joined #git
21:53 Random832 joined #git
21:54 diogenese joined #git
21:58 danslo_ joined #git
21:58 dsdeiz joined #git
22:02 pks joined #git
22:07 saidi joined #git
22:08 Guest96449 left #git
22:10 saidi joined #git
22:21 sarbs joined #git
22:23 vrlx joined #git
22:24 bket joined #git
22:25 |ifei5g00d joined #git
22:26 pbrewczynski joined #git
22:28 Atm0spher1c joined #git
22:30 perrier-jouet joined #git
22:32 ismithers joined #git
22:33 jeffreylevesque joined #git
22:35 bronson joined #git
22:35 shardulc joined #git
22:37 mathematic-alpha joined #git
22:38 mmattice joined #git
22:38 shardulc hello all
22:38 gitinfo shardulc: 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.
22:39 manuelschneid3r joined #git
22:39 Atm0spher1c joined #git
22:39 shardulc I need help with a messy situation I'm stuck in, I've described it in some detail at http://stackoverflow.com/questions/41387282/a-messy-git-situation
22:39 shardulc could anyone please help me?
22:42 kadoban shardulc: Are there any commits in 'master' or origin/master that you actually care about, or do you just want it to to have exactly the same state and history as upstream/master?
22:42 shardulc kadoban: all commits that I care about are also present in topic branches
22:43 shardulc in most cases, going beyond the changes in master
22:43 rewt shardulc, that down-voted answer answers your questions; i don't see why it was down-voted
22:44 mizu_no_oto joined #git
22:44 kadoban shardulc: I assume you're okay with changing history? If nobody is using your fork but you, this is probably safely what you want.
22:44 shardulc rewt: possibly, but I was always pulling from the remote upstream and not from my own repo
22:44 shardulc kadoban: yes
22:45 kadoban shardulc: Assuming that's true, you want something like   'git checkout master && git fetch --all && git reset --hard upstream/master && git push -f'  Make sure you know what all of those do before you do them!
22:46 shardulc kadoban: thanks, I will try that
22:50 denimsoft joined #git
22:56 shardulc kadoban: what should my workflow be in the future?
22:57 shardulc I create a new branch, make changes, submit a PR, and then? if I simply merge won't I have all those extraneous commits in my master again?
22:57 kadoban Treat 'master' as only tracking exactly what upstream does, never write commits there, including merge commits.
22:58 shardulc kadoban: so I will still have commits for merging upstream into amster?
22:58 kadoban Well, you shouldn't because you shouldn't do that.
22:58 shardulc I think I'm not understanding something basic here
22:59 kadoban I'd fetch and make sure it'll be a fast-forward first, or just not use pull at all.
23:00 shardulc so what should I do after a PR from a topic branch is accepted into upstream?
23:00 diogenese joined #git
23:00 Peetz0r joined #git
23:00 shardulc if I understood you correctly, I should fetch upstream, check it will be an FF, and ...?
23:00 kadoban shardulc: To update your master? Fetch and then reset, or if you're sure it will be a ff, you can "merge" then which will do the same thing.
23:01 fmeerkoetter joined #git
23:01 shardulc kadoban: OK, thank you very much!
23:01 kadoban I guess 'git fetch upstream && git merge --ff-only upstream/master' is probably the safest thing, it'll complain if upstream does something weird and never add merge commits.
23:01 kadoban So you'll then have warning too if you accidentally do something wrong (like commit in master)
23:03 shardulc kadoban: will keep that in mind
23:03 rewt joined #git
23:05 davimore__ joined #git
23:07 shardulc left #git
23:10 MrWoohoo joined #git
23:11 DS01 joined #git
23:12 DS01 left #git
23:13 DS01 joined #git
23:13 DS01 Hey how can I checkout a file during merge?
23:14 newbie1 joined #git
23:14 rewt man git show and redirect to a file
23:14 gitinfo the git-show manpage is available at http://jk.gs/git-show.html
23:14 kadoban By checking it out? I don't understand the question.
23:15 rewt basically something like: git show branch:path/to/file > file
23:15 realz joined #git
23:15 DS01 Git checkout "restores" a modified file before commiting it, so i want to do the same during merge
23:16 kadoban DS01: Perhaps you want the --ours or --theirs options to checkout, it's hard for me to say.
23:17 DS01 What are --ours and --their for?
23:18 unborn joined #git
23:19 kadoban They're in the manpage, I doubt I can do a better job than it does for a summary.
23:19 cdown joined #git
23:19 * unborn wish long life to git and all hackers and coders and all open source people around the world (here its just now - well writing this message just in 00*00*00 - Bratislava Slovakia) - happy new year guys and bless open source!
23:20 durham joined #git
23:20 DS01 Hmm, wat?
23:20 kadoban :) happy new years
23:21 DS01 You too
23:21 durham joined #git
23:21 DS01 Anyonz?
23:22 fatalhalt joined #git
23:22 kadoban Anyone what?
23:22 DS01 Nothing
23:23 sword joined #git
23:23 DS01 Anyway I've googled it and I've seen that ours is for keep unmerged file and theirs is for keep file with conflicts
23:23 DS01 So, I need to use --ours, right :D?
23:25 kadoban You haven't given anyone enough information necessary to guess which command you want correctly with any confidence ... and that's not really what this place is for anyway.
23:26 DS01 I have a file called aa.c and after a pull it has conflicts. Well i want to keep aa.c before the merge process
23:27 kadoban Sounds right then
23:28 DS01 I knew
23:28 DS01 I'm a pro
23:29 unborn :D
23:29 unborn lol that message was send from mobile.. very well late arrived.. anyway happy new year guys
23:30 kadoban Was wondering what odd -20m timezone you were in, heh.
23:31 [ADN] joined #git
23:31 unborn kadoban: sometimes this technology can fail us.. as you was wondering.. you should realised.. as usual you know :)
23:32 kadoban Well, there are weird timezones. I know there are some that are 30 minutes disjoint from the usual.
23:32 MIMI joined #git
23:32 mizu_no_oto joined #git
23:32 kadoban But my actual most probable assumption was alcohol related ;)
23:33 bremner alcohol: was it your fault?
23:36 bronson joined #git
23:38 DS01 Happy happy
23:39 unreal joined #git
23:42 unborn kadoban: well I was an alcoholic.. was drinking while coding and then later was seeking inspiration in alcohol to write great things.. luckily I dont drink any more successfully couple of years.. it was just weird time zone on my end :)
23:44 fahadash joined #git
23:47 dsdeiz joined #git
23:47 arescorpio joined #git
23:48 sarbs joined #git
23:50 mizu_no_oto joined #git
23:53 [ADN] joined #git
23:58 pks_ joined #git

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