Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-14

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

All times shown according to UTC.

Time Nick Message
00:00 Eugene Xz - you don't; git commits aren't "on" branches; branches contain commits.
00:00 chris3492 joined #git
00:00 nyuszika7h joined #git
00:00 Eugene You can infer it by looking at the history with gitk or !lol
00:00 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
00:01 Eugene `git branch --contains <sha>` will tell you what branches have that commit
00:02 tristanp joined #git
00:04 romerocesar joined #git
00:04 raininja joined #git
00:06 mischat joined #git
00:06 Rodya_ joined #git
00:06 Xz Eugene: git branch -r --contains <mysha>
00:06 Xz Eugene: I win!
00:07 Eugene !next
00:07 gitinfo Another satisfied customer. NEXT!
00:07 BenderRodriguez joined #git
00:08 pwnz0r joined #git
00:09 son_ joined #git
00:11 tristanp joined #git
00:14 Waskeend joined #git
00:21 Rish joined #git
00:21 rominronin joined #git
00:21 neunon joined #git
00:22 fission6 joined #git
00:23 ahmed_elgabri joined #git
00:27 Shakeel_ joined #git
00:28 ceaucari joined #git
00:29 zeller joined #git
00:30 kadoban joined #git
00:32 c-c joined #git
00:34 thiago joined #git
00:34 rgrinberg joined #git
00:34 unbalancedparen joined #git
00:35 diegoaguilar joined #git
00:37 mischat joined #git
00:45 Schwarzbaer_ joined #git
00:47 jstimm joined #git
00:48 sdothum joined #git
00:55 qpdb joined #git
00:55 tristanp joined #git
00:57 fahadash joined #git
01:01 diogenese joined #git
01:02 dreiss joined #git
01:02 sagerdearia joined #git
01:03 CEnnis91 joined #git
01:05 GandalfTheWizard joined #git
01:06 SwiftMatt joined #git
01:08 ceaucari joined #git
01:12 fstd_ joined #git
01:12 droidicus joined #git
01:13 pks joined #git
01:13 JanC joined #git
01:16 ahmed_elgabri joined #git
01:19 ceaucari joined #git
01:19 Limes_ joined #git
01:22 rominronin joined #git
01:25 italoacasas joined #git
01:26 grassass joined #git
01:29 PaulCapestany joined #git
01:33 ceaucari joined #git
01:33 italoacasas joined #git
01:33 watabou joined #git
01:38 justanotheruser joined #git
01:41 jaguarmagenta joined #git
01:42 efdetonator joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and comedy salvation | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git pull a day keeps the conflict's away
01:53 a3Dman joined #git
01:54 xao joined #git
01:55 liuzhen joined #git
01:58 Wulf4 joined #git
02:00 drodger joined #git
02:02 boudiccas joined #git
02:02 bibek joined #git
02:02 bibek morning everyone
02:03 jchonig joined #git
02:06 adambrenecki joined #git
02:10 arescorpio joined #git
02:13 durham joined #git
02:17 ahmed_elgabri joined #git
02:19 chachasmooth_ joined #git
02:21 kadoban joined #git
02:22 inflames joined #git
02:22 nb-ben joined #git
02:23 rominronin joined #git
02:25 romerocesar joined #git
02:27 _kfpratt joined #git
02:32 hahuang61 joined #git
02:33 nb-ben_ joined #git
02:34 eletuchy joined #git
02:35 Goplat joined #git
02:38 jaguarmagenta joined #git
02:39 nb-ben_ joined #git
02:42 Sasazuka joined #git
02:46 allcentury joined #git
02:46 romerocesar joined #git
02:47 realz joined #git
02:48 me_and joined #git
02:49 noob joined #git
02:50 aavrug joined #git
02:51 sebbu joined #git
02:52 drodger joined #git
02:54 hexagoxel joined #git
02:55 liuzhen joined #git
02:55 netj joined #git
02:56 Rodya_ joined #git
02:58 mostlybadfly joined #git
03:05 ahr3n joined #git
03:12 felixjet joined #git
03:14 drodger joined #git
03:14 liuzhen joined #git
03:14 k_sze[work] joined #git
03:15 ilk joined #git
03:15 shgysk8zer0 joined #git
03:16 sargas joined #git
03:18 ahmed_elgabri joined #git
03:20 k3rn31 joined #git
03:23 MattMaker joined #git
03:24 interne7y joined #git
03:24 rominronin joined #git
03:25 axscode joined #git
03:27 romerocesar joined #git
03:27 _rht joined #git
03:28 axscode hi guys, example i have a repo and within subdirectory i have another .git, what happen if i "git add ." the core parent director
03:28 liuzhen joined #git
03:28 drodger joined #git
03:29 eletuchy joined #git
03:31 fahadash joined #git
03:34 drodger joined #git
03:37 Rodya_ joined #git
03:42 r00twrh joined #git
03:47 romerocesar joined #git
03:48 sangy joined #git
03:49 d4rklit3 joined #git
03:50 jaguarma_ joined #git
03:50 allcentury joined #git
03:53 exawatts joined #git
03:55 drodger joined #git
03:59 italoacasas joined #git
04:02 LeBlaaanc joined #git
04:04 Rodya_ joined #git
04:06 zivester joined #git
04:09 wviana joined #git
04:09 clemf joined #git
04:12 drodger joined #git
04:14 Cabanossi joined #git
04:14 pepeevich joined #git
04:16 pepeevich Hello guys. The problem is that when I try to merge files, git throw the error "Unable to write new index". How can I solve the problem?
04:17 romerocesar joined #git
04:19 ahmed_elgabri joined #git
04:19 rahtgaz joined #git
04:24 grassass joined #git
04:25 tristanp joined #git
04:26 rominronin joined #git
04:26 checkItOut joined #git
04:26 tristanp joined #git
04:32 diegoaguilar joined #git
04:32 tristanp joined #git
04:39 hahuang61 joined #git
04:40 pwnz0r joined #git
04:41 ceaucari joined #git
04:44 dreiss joined #git
04:47 Efffe joined #git
04:48 yuhlw joined #git
04:48 nilg joined #git
04:50 phanimahesh joined #git
04:51 grawity make sure your index file is, in fact, writable
04:52 Raging_Hog joined #git
04:52 Efffe left #git
04:53 maroloccio joined #git
04:56 shgysk8zer0 joined #git
05:00 fii joined #git
05:00 flavius joined #git
05:04 Bin4ry joined #git
05:04 drodger joined #git
05:07 smithbone joined #git
05:07 subhojit777 joined #git
05:07 diogenese joined #git
05:15 gelei007 joined #git
05:16 nellicus_ joined #git
05:17 Bin4ry_ joined #git
05:17 drodger joined #git
05:19 ahmed_elgabri joined #git
05:19 gelei007 hi, i m new git,i dont want git pull to revert all my files,can i just commit some files that i dont want to revert,then the git pull command will not change my committed files?
05:20 gelei007 someone help me
05:21 milki gelei007: git pull doesnt revert anything. can you explain you want in more detail?
05:21 shinnya joined #git
05:22 gelei007 milki:does git pull just fetch the data that changed since i last git pull?
05:23 milki gelei007: git pull is equivalent to a fetch + merge
05:23 MattMaker joined #git
05:23 vuoto joined #git
05:24 romerocesar joined #git
05:25 gelei007 milki:does <git revert > revert all the changes?
05:25 interne7y joined #git
05:25 milki git revert <commit> will produce new commits that would undo the changes introduces by those commits
05:27 rominronin joined #git
05:31 gelei007 milki:i see, thank you!
05:36 clemf joined #git
05:39 ceaucari joined #git
05:40 jceb joined #git
05:40 diogenese joined #git
05:40 allcentury joined #git
05:44 mariuscc joined #git
05:44 Alienpruts joined #git
05:46 eletuchy joined #git
05:48 WizJin joined #git
05:48 sauvin joined #git
05:48 astrofog joined #git
05:49 pungi-man joined #git
05:50 CEnnis91 joined #git
05:50 ThomasLocke joined #git
05:50 pungi-man joined #git
05:51 david007 joined #git
05:51 austincheney joined #git
05:51 boudiccas joined #git
05:55 armyriad joined #git
05:56 david007 joined #git
05:56 scriptonist joined #git
05:58 peff joined #git
05:58 scoobert1on joined #git
06:03 zeroed joined #git
06:06 nilg joined #git
06:07 cyan__ joined #git
06:08 muthu joined #git
06:09 jstimm joined #git
06:09 leeN joined #git
06:10 rscata joined #git
06:10 fracting joined #git
06:12 netj joined #git
06:12 hahuang61 joined #git
06:13 dreiss joined #git
06:19 encod3 joined #git
06:20 netj joined #git
06:20 Andrew_K joined #git
06:20 ahmed_elgabri joined #git
06:20 eletuchy joined #git
06:21 eletuchy joined #git
06:23 sQVe joined #git
06:23 JeroenT joined #git
06:24 sQVe joined #git
06:24 JeroenT joined #git
06:24 sQVe joined #git
06:25 sQVe joined #git
06:25 thiago joined #git
06:26 emPi joined #git
06:26 imjacobclark joined #git
06:27 sQVe joined #git
06:28 rominronin joined #git
06:30 ahmed_elgabri joined #git
06:30 Alienpruts joined #git
06:30 sQVe_ joined #git
06:35 bruce_lee joined #git
06:35 tref joined #git
06:37 fscala joined #git
06:37 JeroenT joined #git
06:38 sQVe joined #git
06:38 sQVe joined #git
06:40 Darcidride joined #git
06:40 sQVe joined #git
06:41 JeroenT joined #git
06:44 freimatz joined #git
06:46 tvw joined #git
06:50 asla joined #git
06:51 asla hello here, i'm trying to commit parts of a _new_ files but i'm not even sure this is possible
06:51 asla I see folks having the same question on SO but i can't get the procedure quite right
06:52 asla for instance, i can have '$git add -N newfile.cpp'
06:52 Seveas asla: git add -N; git add -p, edit patch to only add the bits you want
06:53 asla Seveas: that just adds the whole file ?
06:53 asla Okay, the whole file is new
06:53 asla But i want to add parts of it
06:53 asla is that possible?
06:53 Seveas asla: add -p will let you do that.
06:53 Seveas but you'll need to add -N first
06:54 JeroenT joined #git
06:55 Hounddog joined #git
06:55 aswen joined #git
06:55 Sceorem joined #git
06:56 asla Seveas: Okay, should I select [s], split ?
06:56 asla That's probably what i'm missing
06:57 Seveas no, e for edit
06:58 asla alrighty, thanks!
07:01 Balliad joined #git
07:01 inflames joined #git
07:02 Siamaster joined #git
07:02 solars joined #git
07:02 [Brain] joined #git
07:04 neanderslob joined #git
07:05 dopesong joined #git
07:06 rominronin joined #git
07:06 hhee joined #git
07:10 tref joined #git
07:10 GavinMagnus joined #git
07:11 Hounddog joined #git
07:11 Mogget joined #git
07:13 emPi joined #git
07:13 jaguarmagenta joined #git
07:14 fees joined #git
07:15 xorox90 joined #git
07:15 encod3 joined #git
07:16 ferr1 joined #git
07:18 rominronin joined #git
07:19 emx joined #git
07:19 crs joined #git
07:19 allcentury joined #git
07:19 crs Hey, is it possible to change how diff is printed during git commit? I would like to use diff-so-fancy there too.
07:21 Siamaster I'm trying to show a commit from a different branch without checking out the branch
07:21 Siamaster like git show branch2:HEAD~2
07:21 Siamaster is that possible?
07:25 ojacobson git show branch2~2
07:26 drodger joined #git
07:26 JeroenT joined #git
07:26 Hounddog joined #git
07:26 interne7y joined #git
07:26 ciampix joined #git
07:28 JeroenT joined #git
07:28 mehola joined #git
07:29 vuoto_ joined #git
07:30 Siamaster thanks!
07:30 vuoto_ joined #git
07:30 xorox90 joined #git
07:30 grassass joined #git
07:30 vuoto_ joined #git
07:33 tristanp joined #git
07:34 alex__ joined #git
07:36 van joined #git
07:38 barteks2x joined #git
07:38 vuoto_ joined #git
07:39 ahmed_elgabri joined #git
07:40 elsevero joined #git
07:41 fggtplz joined #git
07:43 Juzzika joined #git
07:46 jceb joined #git
07:48 drodger joined #git
07:49 grazzazz joined #git
07:50 nighttime joined #git
07:51 grassass joined #git
07:52 ronskisika joined #git
07:54 mmattice joined #git
07:54 ronskisika joined #git
07:55 Mogget I have a project with a file (config file) which changes a lot. It adds noise to the git add and git commit screens. Is there a way I can gracefully tell git to not include this file until I actually want to commit it even though it has changed?
07:55 ojacobson Generally (and this advice applies to nearly every scm system), don't track config files
07:56 ojacobson two strategies I've had some success with: track a config.default file, allow an untracked and ignored config.local file to provide environment-specific overrides, or
07:56 ojacobson track a config.example file, and require that every deployment involve creating a config file from the example file
07:57 romerocesar joined #git
07:57 Mogget ojacobson: Awesome. Didn't think about that. Thank you very much.
07:59 cyan__ joined #git
08:01 circ-user-NuHgv joined #git
08:02 jbitdrop joined #git
08:03 kurkale6ka joined #git
08:04 tvw joined #git
08:05 noark9 joined #git
08:07 romerocesar joined #git
08:08 garethdaine joined #git
08:08 ocbtec joined #git
08:08 marcogmonteiro joined #git
08:11 drodger joined #git
08:11 nnyk joined #git
08:15 ToxicFrog joined #git
08:16 bongjovi joined #git
08:17 khelkun joined #git
08:17 basiclaser joined #git
08:18 maxorator joined #git
08:19 _pix joined #git
08:19 keltvek joined #git
08:19 vuoto joined #git
08:20 _pix joined #git
08:21 SimonNa joined #git
08:21 akushner joined #git
08:23 kaendfinger joined #git
08:25 Edward_Black joined #git
08:25 Edward_Black joined #git
08:25 xorox90 joined #git
08:26 acetakwas joined #git
08:26 checkItO1t joined #git
08:27 drodger joined #git
08:27 deepy joined #git
08:28 acetakwas joined #git
08:29 angelsl joined #git
08:30 corpix joined #git
08:31 tomzx joined #git
08:31 mase-tech joined #git
08:32 Balliad joined #git
08:33 mdw joined #git
08:33 Anthaas joined #git
08:34 watabou joined #git
08:35 vuoto_ joined #git
08:38 cdown joined #git
08:40 bluepixel joined #git
08:40 davisonio joined #git
08:41 robotroll joined #git
08:42 mdw joined #git
08:43 alcohol I'm trying to help someone debug an issue; the root cause is that for some reason this clone/checkout ends up in a detached head state. but I don't quite understand why, can anyone take a look? https://travis-ci.org/BenGorUser/Symf​onyRoutingBridgeBundle/jobs/137440804
08:43 alcohol you can unfold the git clone process + result by clicking the triangle next to the log/buffer entry
08:43 robotroll joined #git
08:45 bluepixel joined #git
08:46 g5pw alcohol it's because you're checking out a tag,
08:47 alcohol g5pw: yeah that was my thought too.
08:47 g5pw I don't know the git internals very much, so I don't know why it detaches the head when you check out a tag, but that is the reason
08:48 ewet joined #git
08:49 bremner if HEAD was a tag, then you'd expect the tag to move after a commit. But that's kindof against the point of tags
08:50 davisonio joined #git
08:50 g5pw aha yeah, that makes sense bremner
08:51 g5pw since you don't expect tags to change, you detach from head
08:51 rom1504 alcohol can do that
08:51 a_thakur joined #git
08:52 alcohol not sure why he has a tag setup to build like a branch
08:52 alcohol I'll just call this a user error and move on :p
08:52 rbr joined #git
08:54 jknetl joined #git
08:54 TomyWork joined #git
08:56 digidog joined #git
08:56 acetakwas joined #git
08:56 tuor joined #git
08:58 ahmed_elgabri joined #git
08:58 rom1504 user errors can happen with alcohol ;)
08:59 Shashikant86 joined #git
08:59 moriko joined #git
09:01 mischat joined #git
09:02 notebox joined #git
09:02 mischat joined #git
09:04 Schwarzbaer_ joined #git
09:07 tuor joined #git
09:07 ximvan joined #git
09:09 g5pw alcohol some build systems don't really differentiate between tags and branches since you can use 'git checkout' on both of them :)
09:14 rchavik joined #git
09:14 imjacobclark joined #git
09:15 kedare joined #git
09:15 ams__ joined #git
09:16 tvw joined #git
09:19 dopesong_ joined #git
09:22 allcentury joined #git
09:26 jaguarmagenta joined #git
09:27 paul424 joined #git
09:27 vuoto joined #git
09:27 interne7y joined #git
09:28 alex__ joined #git
09:29 mingramm_ joined #git
09:32 Shashikant86 joined #git
09:33 cdown joined #git
09:33 dopesong joined #git
09:33 nilg joined #git
09:34 inflames joined #git
09:34 mattfoo joined #git
09:38 Orion3k joined #git
09:39 courrier joined #git
09:40 ExeciN joined #git
09:41 digidog joined #git
09:41 mingram__ joined #git
09:46 Nitesh joined #git
09:46 imjacobclark joined #git
09:48 irco joined #git
09:50 allcentury joined #git
09:53 watabou joined #git
09:58 gelei007 hi,gentle man,i m net git,i met a problem,what does git stage do,when i commit my files,it said i must stage first
09:59 mkopriva joined #git
10:03 sQVe joined #git
10:06 dbolser gelei007: https://www.google.co.uk/sea​rch?q=git+tutorial+in+german
10:06 dbolser Looking at this: https://github.com/Ensembl/ensembl-git-tools I can't help feeling there is a more 'git native' way to do a lot of what they are doing (managing a group of repos in unison)
10:06 dbolser any hints?
10:08 khelkun joined #git
10:09 Sceorem joined #git
10:09 Wulf dbolser: what makes you think gelei007 speaks German?
10:10 jagob joined #git
10:13 bremner dbolser: maybe myrepos, depending on what you want
10:13 kashyap joined #git
10:13 mahendra_ joined #git
10:14 heftig dbolser: there's git-subrepo, too
10:14 mahendra_ left #git
10:16 netj joined #git
10:20 gelei007 dbolser:thank you,i think it s a easy way to understand git
10:21 drodger joined #git
10:22 r00twrh joined #git
10:23 jophish joined #git
10:24 kashyap left #git
10:24 eletuchy joined #git
10:25 davisonio joined #git
10:25 mikecmpbll joined #git
10:26 allcentury joined #git
10:27 iLembus joined #git
10:27 Juzzika joined #git
10:31 Guest48869 left #git
10:35 fracting joined #git
10:36 JeroenT joined #git
10:38 sdothum joined #git
10:40 EY joined #git
10:46 fission6 joined #git
10:47 ShekharReddy joined #git
10:47 EY Does anyone know who maintains the Git for Windows build?
10:47 _ikke_ Johannes Schindelin
10:47 ShekharReddy hello how can i prevent commiting backup files e.g auth.php~
10:47 ShekharReddy i have committed already
10:47 _ikke_ Do not track them and add *~ to .gitignore ?
10:48 _ikke_ then remove them
10:48 ShekharReddy _ikke_:  is there any bash command for that
10:48 ShekharReddy ?'
10:49 _ikke_ for what?
10:49 _ikke_ git rm --cached auth.php~
10:49 WayToDoor joined #git
10:50 drodger joined #git
10:51 cbreak ShekharReddy: you could make a hook to prevent semi-malicious introduction of such files too
10:52 dsdeiz joined #git
10:56 PCatinean joined #git
10:57 k3rn31 joined #git
10:59 circ-user-NuHgv joined #git
11:04 Bin4ry_ joined #git
11:05 Shashikant86 joined #git
11:05 bluepixel joined #git
11:07 eletuchy joined #git
11:07 Noldorin joined #git
11:09 echeney joined #git
11:09 Hounddog joined #git
11:11 k3rn31 joined #git
11:14 liuzhen joined #git
11:15 drodger joined #git
11:17 dsdeiz_ joined #git
11:20 watabou joined #git
11:23 tlaxkit joined #git
11:24 nettoweb joined #git
11:24 ome joined #git
11:26 jaguarmagenta joined #git
11:28 dsdeiz joined #git
11:33 zturner joined #git
11:34 docnvk joined #git
11:35 clmsy joined #git
11:36 crameth joined #git
11:36 tristanp joined #git
11:37 crameth joined #git
11:40 chachasmooth joined #git
11:41 drodger joined #git
11:48 toogley joined #git
11:49 eletuchy joined #git
11:52 bruce_lee joined #git
11:55 dan2k3k4 joined #git
11:55 Shashikant86 joined #git
11:57 rnsanchez joined #git
11:59 liuzhen joined #git
11:59 akushner joined #git
12:02 Rish joined #git
12:04 synthroid joined #git
12:09 bsanford joined #git
12:10 King_Hual joined #git
12:10 EY PSA: Guys, Git 2.9.0 for Windows just landed on the website.
12:12 Juzzika joined #git
12:12 rwb joined #git
12:14 acetakwas joined #git
12:15 echeney joined #git
12:15 Juzzika joined #git
12:16 raijin joined #git
12:19 kam270 joined #git
12:21 Muzer joined #git
12:24 SimonNa joined #git
12:24 liuzhen joined #git
12:29 JeroenT joined #git
12:30 fwdit joined #git
12:32 eletuchy joined #git
12:34 subhojit777 joined #git
12:35 fission6 joined #git
12:37 Orion3k joined #git
12:38 heinrich5991 joined #git
12:39 WayToDoor joined #git
12:39 echeney joined #git
12:39 Boniche joined #git
12:41 narendraj9 joined #git
12:41 johnmilton joined #git
12:43 guardian joined #git
12:45 cdg joined #git
12:46 cstratak joined #git
12:47 fission6 joined #git
12:47 axiom_1 joined #git
12:48 luke_penn joined #git
12:50 AciD` joined #git
12:50 AciD` joined #git
12:52 cdown joined #git
12:52 watabou joined #git
12:54 fahadash joined #git
12:54 fscala joined #git
12:57 mdw joined #git
12:57 aavrug joined #git
12:57 ash_workz joined #git
12:58 jknetl joined #git
13:00 aavrug joined #git
13:01 jchonig joined #git
13:01 fmcgeough joined #git
13:02 italoacasas joined #git
13:04 barteks2x joined #git
13:05 drodger joined #git
13:15 OliverJAsh joined #git
13:15 Repox joined #git
13:19 tinarg joined #git
13:20 rnsanchez_ joined #git
13:20 eletuchy joined #git
13:21 tinarg How do I move all the changes I did to one file to a new branch?
13:22 iLembus joined #git
13:23 Darcidride joined #git
13:25 CEnnis91 joined #git
13:25 allcentury joined #git
13:27 WayToDoor joined #git
13:27 crose joined #git
13:27 jaguarmagenta joined #git
13:28 _ikke_ Are the changes to that file in separate commits, or are they interspersed with other changes?
13:28 rgrinberg joined #git
13:28 ekinmur joined #git
13:28 cbreak do you want the history of changes, or only the actual changes?
13:30 aavrug joined #git
13:30 d1b joined #git
13:31 yottabyte joined #git
13:31 yottabyte hi, what is the difference between git add, git add *, and git add .? git add . just adds files in the local directory? and git add * all changes in the repo?
13:31 tinarg _ikke_, the changes in the file are uncommitted. I just added few lines to file and want to move this change to other branch since I release it's branch worthy now.
13:32 _ikke_ tinarg: !float
13:32 gitinfo tinarg: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
13:32 grift left #git
13:32 _ikke_ yottabyte: your shell expands * with all entries in the current dir not starting with a .
13:34 Shashikant86 joined #git
13:35 tinarg thanks _ikke_, float sounds like the thing I'm looking for
13:38 digidog joined #git
13:38 ncthom91 joined #git
13:40 jimi_ joined #git
13:40 liuzhen joined #git
13:45 drodger joined #git
13:45 raininja joined #git
13:48 marc_v92 joined #git
13:49 tlaxkit joined #git
13:50 basteh joined #git
13:53 fling joined #git
13:54 boudiccas joined #git
13:55 nilsi joined #git
13:55 diegoaguilar joined #git
13:56 yottabyte _ikke_: so what's the different between git add and git add *? or is git add without an argument not a thing?
13:56 yottabyte is git add * the proper way to add all new changes?
13:56 ToxicFrog yottabyte: "git add ." is.
13:56 yottabyte but what if I have changes in subdirectories?
13:57 ToxicFrog yottabyte: it recurses.
13:57 ToxicFrog "git add <dir>" is "stage all changes in dir recursively". "git add ." does that on the current directory.
13:58 ToxicFrog "git add *" will only stage changes to things that * expands to, which depends on your shell but typically does not include e.g. dotfiles (such as .gitignore or .gitmodules)
13:58 ToxicFrog "git add" with no arguments does nothing.
13:58 cdesai for some repos, I like to not keep branches and just checkout the remote branch directly. is there a way to keep it pointed to refs/remotes/foo/branch always?
13:58 thiago joined #git
13:58 akushner joined #git
13:59 cdesai perhaps making .git/HEAD point to the remote ref might work
14:00 CJKinni joined #git
14:00 cdesai HEAD -> refs/remotes/origin/master
14:00 cdesai that worked, though I'm not sure if it's a good practice. anyone?
14:01 dhollinger joined #git
14:01 clobrano joined #git
14:02 eletuchy joined #git
14:02 yottabyte ToxicFrog: so will git add * and git add . often add the same things?
14:04 kaldoran joined #git
14:06 manbehindthemadn joined #git
14:06 dopesong_ joined #git
14:06 thurstylark joined #git
14:06 drodger joined #git
14:07 fracting joined #git
14:08 manbehindthemadn Hey fellas, I have a django based dev project, the team use all platforms mac, win, nix. for some reason when the windows boxes perform a commit the other systems detect local change conflicts when pulling.
14:08 grift joined #git
14:08 atomicb0mb joined #git
14:11 dopesong joined #git
14:11 diegoviola joined #git
14:11 mand0 joined #git
14:12 GandalfTheWizard joined #git
14:16 ToxicFrog yottabyte: if you have no dotfiles in the top level of the repo, probably?
14:16 ToxicFrog Like I said, it depends on how your shell handles globbing.
14:16 Gamecubic joined #git
14:16 boudicca joined #git
14:16 ToxicFrog If you want to "add everything", just use "git add ."
14:17 axisys joined #git
14:18 phaleth joined #git
14:19 rkazak joined #git
14:20 notebox joined #git
14:20 tristanp joined #git
14:20 LionsMane joined #git
14:21 yottabyte ToxicFrog: thanks
14:21 marc_v92 joined #git
14:22 akushner joined #git
14:22 thurstylark left #git
14:24 ResidentBiscuit joined #git
14:24 koro if you want to include deletions, use git add . -A
14:25 Shashikant86 joined #git
14:26 marcelofr joined #git
14:28 micah joined #git
14:28 micah i failed and did a force push on a repo, and now I realized my mistake. can I somehow get the previous state of the repo back?
14:29 micah i guess I can use git reflog to reset my repo to that and then force push that
14:30 boudiccas joined #git
14:30 soLucien joined #git
14:31 soLucien i want to clone a git repo in order to deploy code into production . Which git clone arguments should i use?
14:31 soLucien i found --bare and --mirror
14:31 soLucien and i would opt for --bare
14:32 axisys looking for a suggestion on a tool that let you edit a file and commit it with git instead of manually edit and remember to commit it .. these files are TACACS+ config files and cannot be of multiple version for the production configs...
14:32 soLucien however, it may still be a bad choice, so i ask ehre
14:33 drodger joined #git
14:35 mmlb joined #git
14:36 basteh left #git
14:39 boudicca joined #git
14:40 richardlampitt joined #git
14:41 watabou joined #git
14:41 cbreak soLucien: you read !deploy?
14:41 gitinfo soLucien: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
14:41 SimonNa joined #git
14:42 cbreak it has a list of options with some notes about each of them
14:42 lss8 joined #git
14:42 richardlampitt Hello all! Git noob here. 2 related questions: How do I pick out a single file from a branch to merge with my current branch? And is there a way I can accomplish this through git's bundled GUI?
14:43 soLucien yes it has a pretty long list of notes.
14:43 Wulf richardlampitt: 2) dunno  1) you can't do that. You could checkout a certain file from a certain branch or create a new branch with only that file. But *merging* a single file doesn't work
14:43 soLucien it would take me a longer time for me to read all of them and compare them to each other , then for you to point me in the right direction.
14:44 eletuchy joined #git
14:44 richardlampitt Wulf: My current case: I've just created a new branch from a slightly older commit, but I have a .odt file that I'd like to pluck out from the original branch and update it in the new branch.
14:45 richardlampitt Dunno if 'merging' is the correct term
14:45 Wulf richardlampitt: git-checkout
14:45 Wulf richardlampitt: it's not merging though
14:45 zivester joined #git
14:45 richardlampitt Righty
14:46 richardlampitt As someone who almost exclusively uses the GUI rather than CLI, what flags do I need to checkout a single file from that branch?
14:46 Wulf git checkout somebranch -- path/to/file
14:46 DolphinDream joined #git
14:46 davisonio joined #git
14:47 richardlampitt Cool cool. Lemme fire up bash and give it a crack
14:47 boudicca joined #git
14:47 madewokherd joined #git
14:48 subhojit777 joined #git
14:48 richardlampitt Is the bash path relative or absolute from the root of the repository?
14:48 shinnya joined #git
14:49 Wulf richardlampitt: relative
14:49 narendraj9 joined #git
14:50 richardlampitt How do I account for spaces in filenames on the CLI?
14:50 richardlampitt I'm trying to pinch out 'test plan.ods', but git's assuming I'm after 2 files named 'test' and 'plan.ods'
14:51 Wulf richardlampitt: 'foo bar' or "foo bar" or foo\ bar
14:51 richardlampitt Ah, cool, thanks
14:51 richardlampitt I tried %20 but that didn't work, obviously
14:52 catuca joined #git
14:52 Wulf yeah, a shell is not a web browser
14:52 CheckDavid joined #git
14:52 richardlampitt heh indeed
14:52 synthmeat joined #git
14:53 drbean joined #git
14:54 bp9110 joined #git
14:54 boudiccas joined #git
14:54 sangy joined #git
14:55 drbean- joined #git
14:57 drbean_ joined #git
14:58 des_consolado joined #git
14:58 bp9110 I committed/pushed a 'dummy' file since I want it as an example for people viewing the repo. However, I need to then add the file to the .gitignore and make changes to the file but have it remain untracked from that point forward since there is sensitive information in that file. Is that possible?
14:59 des_consolado Hey what's the best practice for dealing with passwords in the code? I can use .gitignore or maybe I could create an environment variable or, any other suggestions?
14:59 bp9110 To add, I added the file to .gitignore but it still shows as modified
14:59 perlpilot des_consolado: don't put passwords in code.  <-- best practice
15:00 des_consolado perlpilot: oh yeah that's great thanks dude... -.-
15:00 drbean joined #git
15:00 des_consolado So what's the best practice for not doing that then? Using an environment variable like I already alluded to?
15:00 perlpilot des_consolado: normally, if you're going to store password info, you do it in a file that's not in git.  Or, if it is, it's in it's own super-secret repo
15:01 i7c bp9110, you want to remove sensitive information and hence rewrite the history?
15:01 perlpilot des_consolado: And environment var could work.
15:01 i7c bp9110, because if you don't rewrite history, the information will still be accessible, even if you "untrack" the file now.
15:01 i7c bp9110: http://stackoverflow.com/questions/872565/remove-s​ensitive-files-and-their-commits-from-git-history
15:02 kilo_bravo joined #git
15:03 i7c des_consolado, env var is fine if you don't mind the password being in an env var. ;)
15:03 kpease joined #git
15:03 Gloomy joined #git
15:06 perlpilot des_consolado: What I've done in the past is have a config file with most of the configuration information and then an "include" type statement to load in sensitive info like username/password.   The sensitive info is obviously not stored in git, but the main config file is.
15:06 boudicca joined #git
15:07 drbean_ joined #git
15:08 clemf joined #git
15:09 Eugene des_consolado - !configfiles
15:09 gitinfo des_consolado: 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
15:09 nsxeqo joined #git
15:10 perlpilot Eugene++  I never remember the right phrases to twiddle the bot
15:10 baraba joined #git
15:10 Eugene Study up. !factoids
15:10 gitinfo [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
15:10 drbean- joined #git
15:11 dmto joined #git
15:11 Blkt joined #git
15:11 Topic for #git is now Welcome to #git, the place for git help and release parties | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | If you have anything staged, commit now or stash forever
15:11 Eugene .version
15:11 gitinfo Eugene: .version: still at 2.9.0, not updating topic.
15:12 InfoTest joined #git
15:12 Blkt joined #git
15:13 Dougie187 joined #git
15:13 maucar joined #git
15:14 drbean joined #git
15:14 tyreld joined #git
15:14 drodger joined #git
15:16 _ikke_ Eugene: Already updated it :-)
15:17 bango2 joined #git
15:18 dopesong_ joined #git
15:19 nettoweb joined #git
15:23 davidosomething joined #git
15:24 sparr how can I configure git to use different ssh credentials for different repos on the same server?
15:25 drbean joined #git
15:26 perlpilot sparr: creds are per-repo, not per-server.  How did you "configure git" for the first repo?
15:27 sparr I don't think I ever configured specific git credentials. My ssh keys are handled by ssh-agent
15:27 drbean_ joined #git
15:27 perlpilot sparr: oh, I made an assumption that you aren't using the git daemon ... ignore me if that's the case
15:27 perlpilot :)
15:28 jaguarmagenta joined #git
15:28 eletuchy joined #git
15:29 sparr ok, apparently I'm wrong, since I can still `ssh -T git@github.com` even without ssh-agent running
15:29 drbean- joined #git
15:29 IWishIKnew joined #git
15:29 sparr ahh, it's set in my ~/.ssh/config
15:29 InfoTest1 joined #git
15:30 sparr original question still applies. that configuration is per-host. what method can I use for per-repo credentials?
15:30 interne7y joined #git
15:31 perlpilot sparr: you can put multiple "hosts" in .ssh/config that point at the same machine but with different user/identity.
15:31 thiago sparr: configure SSH, not Git
15:31 thiago sparr: see ~/.ssh/config
15:31 sparr thiago: that's where I'm at now
15:31 thiago my hint is to use different Host sections with the same HostName entry to pass different login names or keys
15:32 sparr perlpilot: so then I'd change the remote hostname for my local git repos to the fake hostnames defined in the git config?
15:32 thiago yes
15:32 perlpilot sparr: ssh config
15:32 perlpilot (it has nothing to do with git at this point)
15:32 acetakwas joined #git
15:32 sparr perlpilot: I'm still confused how to do this without changing git remote URLs
15:32 thiago you change the remote URLs
15:32 perlpilot sparr: you change them too.
15:33 sparr you just said it had nothing to do with git...
15:33 texasmynsted joined #git
15:33 kpease joined #git
15:33 texasmynsted I did a pull and now some files are marked UU
15:33 texasmynsted I they are conflicts but they are files I do not care about.
15:33 thiago sparr: the ssh configuration of the identity has nothing to do with git
15:33 texasmynsted I tried to overwrite them with a git co, but that did not work
15:33 texasmynsted I tried rm them
15:34 texasmynsted that did not work
15:34 thiago sparr: but once you create the "fake host", you update the git config to use it
15:34 Alienpruts joined #git
15:34 perlpilot sparr: sorry, I'm not being clear.  thiago has the truth of it though.
15:34 texasmynsted How do I say, I do not care about these files please overwrite with repo version
15:34 ceaucari joined #git
15:34 thiago texasmynsted: git co HEAD
15:34 rominronin joined #git
15:34 drodger joined #git
15:35 thiago texasmynsted: git co -- filename  checks out from the index. Since it's the index that has the conflict, you didn't clear the conflict.
15:35 thiago texasmynsted: git co commit -- filename  checks out from that commit
15:35 aavrug joined #git
15:35 sparr ok, thanks. I've now got a ssh Host defined for github.com-foo and I'm using that as the hostname in my git remote
15:36 aavrug joined #git
15:36 texasmynsted ok that worked
15:36 texasmynsted thank you
15:36 texasmynsted hah  :-)  thanks again
15:37 btcquant joined #git
15:38 UTAN_dev joined #git
15:38 d0nn1e joined #git
15:41 whatevsz joined #git
15:42 ericvw joined #git
15:43 drbean joined #git
15:43 Bin4ry_ joined #git
15:44 Spacew00t joined #git
15:45 mdw joined #git
15:47 ceaucari joined #git
15:49 ToxicFrog koro: /buffer 42
15:49 ToxicFrog Whoops
15:51 netj joined #git
15:52 ceaucari joined #git
15:54 bsanford joined #git
15:56 son joined #git
15:56 drbean_ joined #git
15:56 drodger joined #git
15:58 dsdeiz_ joined #git
15:58 sargas joined #git
15:59 madewokherd joined #git
16:00 marc_v92 joined #git
16:03 knutstrut joined #git
16:03 ejb joined #git
16:03 bp9110 i7c: Sorry for not responding, I was away for a while. I should probably clarify. I'd like to have a 'dummy' file exist on Github that is generic showing the template. However, the local version of the file will have OAuth2 keys that obviously I don't want people to have. So essentially I'd like to commit a generic file to Github, add the file to .
16:03 bp9110 gitignore, then change the local contents to the tokens and not commit
16:04 efco joined #git
16:04 synthroid joined #git
16:04 bp9110 i7c: The alternative is to just not track the file completely and not even have a template file on Github...but if possible I feel like it'd be nice to have that generic file to exist so other people can look at it
16:04 dreiss joined #git
16:05 nilsi joined #git
16:06 watabou joined #git
16:06 nnyk joined #git
16:06 madewokherd joined #git
16:07 fii joined #git
16:09 hahuang61 joined #git
16:11 LeBlaaanc joined #git
16:11 durham joined #git
16:12 eletuchy joined #git
16:12 romerocesar joined #git
16:14 ochorocho__ joined #git
16:14 vuoto joined #git
16:15 diogenese joined #git
16:17 tomog999_ joined #git
16:18 irco joined #git
16:18 nnyk joined #git
16:18 son joined #git
16:19 diphtherial joined #git
16:20 diphtherial say that i clone someone's repo as a template for my own project; is it best to just wipe the .git folder and re-init?
16:20 imachuchu joined #git
16:21 FilipNortic joined #git
16:21 bp9110 Is it possible to have a generic remote file (on Github) that is not tracked locally? I'd like the local file to have some OAuth2 tokens but clearly I can't push that to the repo. I tried pushing a generic file to GitHub, adding the local file to .gitignore, then changing the contents of the local file. However the local file still shows up as modi
16:21 bp9110 fied even though it's in gitignore
16:22 diphtherial unfortunately, you're going to have to remove it from the commit log as well; here's some instructions: https://help.github.com/arti​cles/remove-sensitive-data/
16:22 diphtherial and yes, if it's been added to the repo it's tracked; .gitignore only ignores files that are untracked
16:23 diphtherial (you can remove it from the repo via git rm --cached and leave the untracked copy on disk, by the way, but again it'll be in your commit history)
16:24 bp9110 diphtherial: Thanks for the link - I will give that a read. I suppose that makes sense, I'm just quite new to Git and was hoping I could commit/push the one file and then ignore changes to the file from then on out. I haven't committed the file with sensitive information just the generic file so far
16:25 Xz left #git
16:25 diphtherial bp9110: ah, great, then no need to expunge your commit history
16:25 diphtherial just to verify, you haven't committed the sensitive file at all, right?
16:27 bp9110 diphtherial: Correct. So right now I have a generic file committed and pushed to GitHub and a sensitive file locally. That file shows up as modified (obviously -- as I'm learning) and I was hoping to ignore that file now
16:27 diphtherial also note that you can use git update-index --assume-unchanged <file> on the dummy file, then fill it out with sensitive info later
16:27 bp9110 However that appears to not be the case... so best case may be to just remove the file entirely and not track it?
16:27 diphtherial git will ignore changes to the file
16:28 bp9110 Oh wait. Let me read your message again - maybe that's what I'm looking for?
16:28 AlexRussia joined #git
16:28 diphtherial yeah, typically the way people do it is to ignore the actual file, then have a sensitive.ini.RENAME file that's a template for the config file with the sensitive info
16:28 SASDOE joined #git
16:28 diphtherial the other way to do it is to use update-index --assume-unchanged
16:29 bp9110 diphtherial: aha, awesome. Okay so right now I have a dummy file committed and a sensitive file locally (same file name). Can I simply do the update-index --assume-unchanged at this point?
16:29 diphtherial yes (and just to make sure, the sensitive file isn't staged, right?)
16:30 diphtherial if you run git status after assuming it unchanged it should no longer show up in the list
16:30 diphtherial by the way, if you ever want to reverse it, you can use git update-index --no-assume-unchanged <file>
16:30 bp9110 I believe so (new to Git, so bear with me). A git status says it's unstaged and my next step would be to add it -- but I haven't done that yet
16:30 diphtherial great, go ahead and assume-unchanged it and see what git status says
16:31 durham_ joined #git
16:31 diphtherial frankly, this is part of git that's hazy for me as well, since i do it rarely, so it's nice to refresh myself
16:31 algun joined #git
16:31 dsdeiz joined #git
16:31 mmmveggies joined #git
16:32 bp9110 diphtherial: Okay, after making the --assume-unchanged change it stays that there's nothing to commit and that I have a working directory clean. So I think that's exactly what I wanted!
16:32 romerocesar joined #git
16:33 diphtherial nice!
16:33 bp9110 diphtherial: Awesome, thanks a lot! So much to learn about git yet
16:33 romerocesar joined #git
16:33 drbean joined #git
16:33 ejb joined #git
16:33 diphtherial i find the day-to-day knowledge you need is a much smaller surface area than the entire thing, if that's encouraging at all
16:34 bp9110 diphtherial: Indeed. I'm still quite hazy on forks and PRs and the such since I haven't had a need to do them yet
16:34 mmmveggies Odd scenario. So I have `master`, `sprint`, and `feature`. I successfully pull F into S, but then M gets updated, so I rebase F from M and do some more adding to F. then when I try to PR F into S again, I'm seeing the diffs from the original commits in F against S, but it should already have those commits right?
16:35 diphtherial bp9110: those are strictly speaking github and not git features, just fyi; they make use of git's remote mechanism and the site for notifying you of PRs, etc.
16:36 diphtherial but yeah, they are good to know if you're going to collaborate on OSS via github
16:36 bp9110 diphtherial: Yep, shows how much I know. Thanks for the clarification
16:36 zumba_addict joined #git
16:36 mmmveggies I will admit, the commits in F have different hashes than the original ones after a rebase, but It seems that GitHub is not prepared for this scenario
16:36 ElChicoNube joined #git
16:36 dsdeiz joined #git
16:36 dsdeiz joined #git
16:37 StuartMI joined #git
16:37 Spacew00t joined #git
16:40 Waskeend joined #git
16:40 TomyLobo joined #git
16:41 _rht joined #git
16:43 marc_v92 joined #git
16:43 basiclaser joined #git
16:44 mmmveggies Here's a visual explanation  https://usercontent.irccloud-cdn.com/​file/z5kVNicR/rebase%20diff%20problem
16:44 drbean_ joined #git
16:44 djb-irc joined #git
16:45 Ali2 joined #git
16:47 mohabaks joined #git
16:48 Juzzika joined #git
16:50 dbolser Wulf: isn't it obvious?
16:51 dbolser bremner, heftig: thanks
16:52 Ahmed90 joined #git
16:52 eletuchy joined #git
16:52 Wulf dbolser: no, not exactly
16:52 Wulf dbolser: IP address said Philipines, language defects were atypical for Germans too
16:53 aard_ joined #git
16:53 thiago_ joined #git
16:53 dbolser well, seems I was right... 11:20 < gelei007> dbolser:thank you,i think it s a easy way to understand git
16:53 zumba_addict joined #git
16:53 dbolser so he's either a german speaker,  or appreciates the logic of the german tutorials
16:53 al-damiri joined #git
16:55 mmmveggies Looks like rebasing is probably not the right option here... It's creating redundant commits, although the merge itself has no problems
16:55 dsdeiz_ joined #git
16:55 Wulf dbolser: or an Asian who says "thank you" and "I understood everything you said" just to be polite
16:56 Wulf will we ever find out?
16:57 dbolser gelei007! Where are you now!
16:57 rominronin joined #git
16:58 mikecmpbll joined #git
16:59 nnyk joined #git
16:59 orbitphreak joined #git
17:00 durham joined #git
17:01 MrWoohoo joined #git
17:01 durham joined #git
17:01 GavinMagnus left #git
17:01 Matrixiumn joined #git
17:03 cek joined #git
17:03 cek trying to split a dir into a submodule. I've added submod remote, but now git status in top shows me uncommited files, it doesn't see them as submodule
17:06 cek book talks about submods being cloned from remote. I am doing reverse, i'm willing to push to remote, remote is empty right now.
17:06 mmmveggies and the diffs were showing because rebasing changes their hash numbers, but merges are fine
17:07 hahuang61 joined #git
17:07 yottabyte left #git
17:07 Juzzika_ joined #git
17:09 anu0 joined #git
17:10 dstarh joined #git
17:12 ciampix joined #git
17:12 IWishIKnew joined #git
17:16 synthroid joined #git
17:17 d4rklit3 joined #git
17:17 marc_v92 joined #git
17:18 Lorcatar joined #git
17:21 mdw joined #git
17:21 zturner joined #git
17:22 romerocesar joined #git
17:23 axiom_1 joined #git
17:23 ejb joined #git
17:25 scorphus joined #git
17:26 richardlampitt joined #git
17:26 InfoTest joined #git
17:26 spudowiar1 joined #git
17:27 jimi_ joined #git
17:30 durham_ joined #git
17:31 jimi_ joined #git
17:32 axisys so anyone done any automation and can suggest to take a look to automate git commit as soon as file gets edited?
17:32 ceaucari joined #git
17:33 axisys plus I like to trigger a git commit as soon as a the file gets edited or replaced
17:33 ResidentBiscuit :O
17:33 ResidentBiscuit Sounds like a nightmare
17:33 perlpilot automated commit sounds ... what ResidentBiscuit said
17:34 eletuchy joined #git
17:35 diphtherial yeah, commits should be meaningful -- if you just want to sync changes to a remote, there are better choices
17:36 ResidentBiscuit auto commit force push
17:36 diphtherial from the times i've asked a similar question, i've come to realize it's because i don't have proper dev and production environments set up
17:37 diphtherial even if there's no real "production", you'll save yourself a lot of headache by just having two sets of configs for when you're editing it locally and when you're running it remotely -- you can pull on the production server when it's ready to be there, and tweak to your heart's content in dev
17:38 diphtherial if you *really* want to sync to a remote, use rsync or some other synchronization tool
17:38 Sasazuka__ joined #git
17:38 ceaucari joined #git
17:41 Bin4ry_ joined #git
17:42 hahuang61 joined #git
17:44 roentgen joined #git
17:50 italoacasas joined #git
17:51 kadoban joined #git
17:51 ahmed_elgabri joined #git
17:52 Ldip joined #git
17:52 davisonio joined #git
17:53 jimi_ joined #git
17:54 dfanjul joined #git
17:54 axisys let me rephrase my question.. I meant trigger git commit prompt...
17:56 perlpilot axisys: write a command that runs your editor, then afterwards runs git add/commit/whatever
17:56 perlpilot Then use that command instead of your normal editor command
17:56 axisys so usually we forget to commit the change after editing a file.. I like suggestion how to prompt a git commit at the end of a edit of a file or replace of a file with a newer version
17:57 axisys perlpilot: essentially yes.. but I might overlook different conditions, so looking for something for a start/guide
17:57 perlpilot axisys: also, depending on your editor, many have ways to commit from within them.
17:57 axisys vim
17:58 axisys but I only want to git commit if it is a tacacs config file of pattern tacacs-foo.conf
17:58 axisys so not globally install a vim plugin for all files...
17:58 perlpilot btw, you might want to look at vim-fugitive
17:59 rominronin joined #git
17:59 sebbu joined #git
17:59 axisys perlpilot: I did a little.. but that would apply to any file and not just tacacs-foo.conf like file.
18:00 axisys I am not sure if we will remember to run :Gcommit
18:00 perlpilot you're asking for a technical solution to a social problem.
18:01 perlpilot That usually ends badly.
18:01 axisys we have been running change instead of vi to edit files and change does rcs in the backend.. we want to change that to git
18:01 axisys change is home grown.. not unix change
18:02 sargas joined #git
18:02 dsdeiz joined #git
18:03 kadoban axisys: A computer can't tell when you should commit. Any attempt to make it tell you when to commit seems like a bad idea.
18:04 axisys I am pretty sure other people hiding git complexitity in the backend with some wrappers.. I am just hoping for some of those people hanging out here.. hoping it wont turn into a needle in the haystack..
18:04 kadoban One change does not equal a commit, nor does any specific number or amount of changed stuff.
18:04 cek Why isn't my submodule showing up when doing "git submodule status"?
18:04 axisys kadoban: I think I might not be explaining the problem to something familiar to the crowd
18:05 idmistir joined #git
18:05 idmistir joined #git
18:05 ajm203_ left #git
18:06 axisys kadoban: I am saying a way to get a git prompt when finish editing a tacacs-foo.conf like file..  sounds like I am not successful in explaining it yet..
18:06 sbeller_ cek: are you in a subdirectory? on another branch?
18:06 cek sbeller_: i'm in top dir
18:06 axisys kadoban: s/saying/looking for/
18:07 axisys kadoban: s/git prompt/git commit prompt/
18:08 solars joined #git
18:08 kadoban axisys: You really just have to build up the habit of doing it.
18:08 sbeller_ cek: does it have common prefixes? c.f. https://kernel.googlesource.com/pub/scm/git/g​it/+/2b56bb7a87ab429c225f6325f2870cbeac0d19f9
18:09 sbeller_ cek: what version of Git are you on?
18:09 axisys kadoban: we also have script that edit those files specially when bulk adding users into the config file...
18:09 cek 2.4.10 . common prefixes of what?
18:10 sbeller_ of submodules, i.e. path/to/submoduleA and /path/to/submoduleB have both /path/to in there
18:10 axisys kadoban: so script probably need to call git commit ?
18:10 perlpilot axisys: run "git commit <filename>" after editing.
18:10 gniourf joined #git
18:10 sbeller_ that confused Git for a while, but in 2.7, 2.4 is earlier
18:10 axisys perlpilot: I need to provide ticket number as an argument as well
18:10 cek path in where man?
18:10 mmlb joined #git
18:10 raininja joined #git
18:11 cek /path/topdir is main project,  /path/topdir/submodule is a submod repo
18:11 d4rklit3 joined #git
18:11 axisys perlpilot: all config changes are ticket request
18:12 D-Boy joined #git
18:12 nick123 joined #git
18:12 perlpilot axisys: What we do at work is make feature branches based off of ticket numbers.  I have a commit-msg git hook that automatically inserts the ticket number into the message (as that's a requirement around here)
18:13 akiva joined #git
18:13 perlpilot axisys: you can do something similar.
18:13 dsdeiz_ joined #git
18:14 m0viefreak joined #git
18:17 eletuchy joined #git
18:17 durham joined #git
18:17 cek how do i check a dir exists in git repo?
18:18 cek git rev-parse --resolve-git-dir doesn't produce anything
18:18 durham joined #git
18:19 cek fatal: not a gitdir 'agent/nettest/agent'     despite git log -- agent/nettest/agent showing proper log entries on it.
18:19 robot joined #git
18:19 R4b joined #git
18:22 denkijin joined #git
18:24 dreiss joined #git
18:27 Tratos joined #git
18:29 * axisys disclaimer: git newbie
18:29 axisys perlpilot: ^
18:30 axisys perlpilot: can you give a list of commands just for an example I can explore on?
18:30 tristanp joined #git
18:31 axisys git checkout -b ticketnumer for a start?
18:31 Grum joined #git
18:31 axisys git checkout -b rt123456
18:31 dsa joined #git
18:32 dsa I want to have 2 remotes, heroku and bitbucket, is that possible?
18:32 dsa so i want to be able to do: git push remotes master
18:32 dsa in one call
18:33 cdg joined #git
18:33 khmarbaise joined #git
18:34 mohabaks joined #git
18:34 _ikke_ You can have multiple remotes, but git only pushes to one remote at the time
18:35 drodger joined #git
18:37 djb-irc joined #git
18:37 elsevero joined #git
18:39 mohabaks_ joined #git
18:40 nwkj86 joined #git
18:40 mase-tech joined #git
18:41 perlpilot axisys: perhaps you should look at !progit or the git man page to familiarize yourself with the git commands?
18:41 gitinfo axisys: [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
18:41 nick123 joined #git
18:42 mohabaks joined #git
18:42 rcpp85 joined #git
18:42 multi_io joined #git
18:46 kmakx joined #git
18:48 Corosus joined #git
18:50 cdown joined #git
18:51 rcpp85 Hi all! Can someone explain me why (in which case) I'd use "git update-ref"? And what exactly it does? I have a problem where a team on another part of the globe (literaly) uses Ungit to manage their side of the repo, where they use  a "Move" feature. Looking into it, I've found that this feature makes a "update-ref". However, I'm not feeling secure enough to perform   a command without knowing it.
18:52 LeBlaaanc should I merge bug fixes directly into a release (maintenance) branch or go into develop then release?
18:52 axisys perlpilot: just saw your link.. but what you know I just bumped into that site through the /topic url
18:52 axisys perlpilot: thank you!
18:53 LaptopBrain joined #git
18:54 rcpp85 Our scenario, right now, is: we have a "master", an "integration" (a branch which is become useless) and preproduction. Every new branch  comes from "integration" and is merged into "preprod" before we merge this branch into "master". They want us to "align" master and preprod doing this "move" on Ungit.
18:54 ash_workz joined #git
18:55 spriz joined #git
18:58 rominronin joined #git
19:01 Guest18887 joined #git
19:01 grawity `git update-ref` changes the commit that a ref (i.e. a branch, a tag, etc.) points to; you could say it's similar to `git branch -f` or `git reset --hard` (depending on situation)
19:02 zivester joined #git
19:04 Dyonisos joined #git
19:05 drodger joined #git
19:06 LaptopBrain joined #git
19:06 fission6 joined #git
19:08 yqt joined #git
19:09 yhke joined #git
19:09 rcpp85 grawity: suppose my last commit on "preprod" was "fixing issues on foobar" and on master was "adding new features on foobar" and then I do a "update-ref" on preprod. if i understood right, my last commit on preprod will become the same as on "master". Am I completely lost?
19:10 dsdeiz joined #git
19:10 grawity if you do `git update-ref refs/heads/preprod master`, yes
19:10 sebboh left #git
19:10 grawity there's no default; you have to tell it what to point where
19:11 Kobaz hey i'm having a problem trying to clear out my stash
19:11 Kobaz i have a clean tree, and ahead 3 commits from my source
19:11 Kobaz i do a git stash pop
19:11 Kobaz it complains it cannot merge clean and there was a conflict
19:11 Kobaz so i edit and fix the conflict, git add the file, and there's no changes
19:11 Kobaz i want to keep what i have
19:12 Kobaz so when i run git st again, it's clean
19:12 Kobaz i do a git stash pop and it pulls down the same stash, and creates the same conflict, i'm stuck in a loop
19:12 rcpp85 grawity: I see. I'm afraid that we may screw our repos doing this, but I'm not sure since I never used "update-ref".
19:12 mischat joined #git
19:16 Lunatrius` joined #git
19:17 jimi_ joined #git
19:18 ncthom91 joined #git
19:20 McNozes joined #git
19:25 eletuchy joined #git
19:26 drodger joined #git
19:29 heinrich5991 joined #git
19:29 jaguarmagenta joined #git
19:29 laor joined #git
19:31 zturner_ joined #git
19:32 interne7y joined #git
19:35 stuh84 joined #git
19:35 Kobaz any ideas?
19:36 Kobaz how to fix up my stash so it's not stuck?
19:36 aswen joined #git
19:36 grawity Kobaz: throw it away with `git stash drop`?
19:36 Kobaz no
19:37 Kobaz so, let me rephrase.  fix up my stash and not lose any data
19:38 paul424 joined #git
19:38 doritos joined #git
19:39 IWishIKnew joined #git
19:40 ekinmur joined #git
19:41 barteks2x joined #git
19:44 chris3492 joined #git
19:45 ceaucari joined #git
19:46 NeonSynth joined #git
19:47 tristanp joined #git
19:47 mish4 joined #git
19:47 cdown joined #git
19:47 tristanp joined #git
19:48 mish4 i thought that one of the benefits of a .gitignore is you can add a whole directory using git add, and it will automatically ignore the files in the gitignore. instead it just informs you that a file in the directory is in your gitignore
19:48 doritos joined #git
19:49 heinrich5991 joined #git
19:51 shuaib joined #git
19:51 apotry joined #git
19:52 grawity well that depends on whether you _actually_ add a whole directory, or just the individual files inside
19:52 grawity `git add dir/` and `git add dir/*` will have different results
19:53 mish4 so if i want to add the directory and all files in it, i should use the first. and it will leave out files present in the .gitignore?
19:53 mish4 i'm currently using the latter
19:53 grawity yes
19:54 editshare-ericf joined #git
19:54 grawity even though the repository "doesn't track directories" as is often parrotted, things like `git add` still behave differently on whether the *arguments* are a directory (to check recursively) or a list of files (to check immediately)
19:54 mish4 so the problem with the latter is you are saying, give me all files inside that directory and add them, which means you are specifying some that may be on the .gitignore and that will cause a conflict
19:54 grawity right
19:55 grawity the result is, basically, like trying to individually `git add` an ignored file
19:55 grawity most people like a warning in that situation
19:55 mish4 right. but there is no way to git add a bunch of files that meet some pattern and still have .gitignore be applied
19:56 rgrinberg joined #git
19:57 Dreamer3 joined #git
19:57 pandeiro joined #git
19:58 corpix joined #git
19:59 rominronin joined #git
20:00 nnyk joined #git
20:00 tristanp joined #git
20:01 mmlb joined #git
20:01 kaldoran joined #git
20:03 rueben joined #git
20:03 Schwarzbaer_ joined #git
20:04 eletuchy joined #git
20:04 khmarbaise joined #git
20:05 holodoc joined #git
20:06 drodger joined #git
20:08 italoacasas joined #git
20:10 var_x joined #git
20:11 drodger joined #git
20:12 hahuang62 joined #git
20:13 BirdStealsTheBal joined #git
20:16 BirdStealsTheBal Can you please tell me why after fresh clone in ROOT/.git/config I always see core.filemode=true? Is there a way to override this default?
20:16 BirdStealsTheBal Damn Cygwin needs core.filemode=false :(
20:17 _ikke_ git detects when the filesystem does not support the executable bit, and will automatically set it to true then
20:17 _ikke_ iirc, no way to override this
20:22 BirdStealsTheBal _ikke_: What would be the recommend value for git 2.1 running on Cygwin on Win 7 on NTFS?
20:23 BirdStealsTheBal _ikke_: I had weird behaviour when I didn't execute chmod from Cygwin but after git add/commit/push the files somehow got the +x mode.
20:23 f3r70rr35f joined #git
20:23 _ikke_ Sorry, I was mistaken. It will set it to false when it detects incompattible filesystems
20:24 BirdStealsTheBal _ikke_: So there is no way to force it other than doing manual git config after clone?
20:24 _ikke_ aye
20:25 romerocesar joined #git
20:26 rueben joined #git
20:26 raininja joined #git
20:27 anu joined #git
20:29 vuoto joined #git
20:29 LaptopBrain joined #git
20:33 concerti joined #git
20:33 eijk joined #git
20:36 drodger joined #git
20:37 nnyk_ joined #git
20:37 netcarver joined #git
20:40 ojdo joined #git
20:41 whatevsz joined #git
20:41 drodger joined #git
20:42 nidr0x joined #git
20:42 cdown joined #git
20:43 Ahmed90 joined #git
20:44 MattMaker joined #git
20:46 Error404NotFound joined #git
20:46 Error404NotFound joined #git
20:49 Yaiyan joined #git
20:49 eletuchy_ joined #git
20:53 eletuchy joined #git
20:56 vuoto_ joined #git
20:56 eletuchy_ joined #git
20:58 Dyonisos joined #git
20:58 eletuch__ joined #git
20:58 aidalgol joined #git
21:00 rominronin joined #git
21:00 Neal_ joined #git
21:00 ws2k3 joined #git
21:01 Virox joined #git
21:01 eletuchy joined #git
21:01 BooK joined #git
21:01 devsterknight|ZN joined #git
21:01 ynanm joined #git
21:01 FabTG joined #git
21:02 ZeDestructor joined #git
21:02 mdw joined #git
21:02 neersighted joined #git
21:02 MikeChernev joined #git
21:02 thejoecarroll joined #git
21:02 crose joined #git
21:03 drodger joined #git
21:04 eletuchy_ joined #git
21:05 arooni joined #git
21:05 rgrinberg joined #git
21:07 eletuchy joined #git
21:08 nwkj86 joined #git
21:10 NeonSynth_ joined #git
21:10 ahmed_elgabri joined #git
21:10 eletuchy_ joined #git
21:11 radsy joined #git
21:13 skunkz joined #git
21:14 eletuchy joined #git
21:14 vuoto joined #git
21:15 DANtheBEASTman joined #git
21:15 hhee joined #git
21:17 eletuchy_ joined #git
21:18 madewokherd joined #git
21:18 cosmicfires joined #git
21:18 cosmicfires I had a git repository in the root of my project directory on ubuntu 14.04, I installed 16.04 and copied my working directory and repository
21:19 cosmicfires now eclipse doesn't recognize my repository
21:19 cosmicfires git commands outside eclipse work
21:19 hhee hey! good night. any way to install more newest version git in centos 7?
21:20 hhee i have 1.8 version
21:20 hhee as i know - it's quite outdated?
21:20 cdown joined #git
21:21 tristanp joined #git
21:21 hhee i don't want to compile from sources, maybe some repos for centos exist?
21:22 nidr0x joined #git
21:22 mischat joined #git
21:24 SimonNa joined #git
21:25 romerocesar joined #git
21:26 vuoto__ joined #git
21:26 vuoto___ joined #git
21:27 urda joined #git
21:29 urda joined #git
21:30 Xz joined #git
21:30 Xz hi there, I have a modified status and 'git branch' shows 'detached'. How do I jump on the branch with my 'modified' status in order to commit all my changes to a given branch?
21:30 jaguarmagenta joined #git
21:30 Xz I pretty much want to create new branch and save all my not-yet-commited changes there
21:31 cdown_ joined #git
21:32 interne7y joined #git
21:33 cyan__ joined #git
21:33 Xz if I 'git checkout' now I will lose my changes, as I'm currently detached
21:33 Xz git is so hard!
21:33 osse Xz: !float
21:33 gitinfo Xz: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
21:33 khmarbaise joined #git
21:34 diegoaguilar joined #git
21:34 Xz osse: uh, git stash, thanks for the hint
21:34 osse Xz: you are wrong in saying that checkout will lose your changes
21:35 LaptopBrain joined #git
21:35 Xz osse: will it not?
21:35 osse like the bot says
21:35 osse git will check if it can perform the checkout without touching your modified files. if it can't then it will not continue with the checkout
21:36 Xz osse: alright now
21:36 osse I mean, when you do ''git checkout branchname''
21:36 Xz osse: I guess it's a bit fuzzy because you can also do 'git checkout SHA'
21:36 mikecmpbll joined #git
21:36 nidr0x joined #git
21:36 Xz osse and then it will lose uncommited changes, right?
21:37 osse nope
21:37 osse same as above
21:37 Xz osse: alright, I guess I need to learn more git
21:37 mellernoia joined #git
21:37 Xz osse: thanks for you insights though!
21:39 WaReZ joined #git
21:40 osse Xz: so in your case you might not even need to stash and then pop the stash
21:40 osse on the other hand it doesn't hurt
21:42 Orion3k joined #git
21:43 jfran joined #git
21:45 son joined #git
21:45 vuoto joined #git
21:46 joki joined #git
21:50 vuoto_ joined #git
21:51 son joined #git
21:51 nidr0x joined #git
21:51 j416 joined #git
21:52 vuoto joined #git
21:52 lindenle joined #git
21:53 Dougie187 left #git
21:53 drodger joined #git
21:54 artemisart joined #git
21:55 romerocesar joined #git
21:56 Synthead joined #git
21:56 hwrdprkns joined #git
21:56 nettoweb joined #git
21:56 mkopriva joined #git
21:56 vuoto joined #git
21:57 soreau joined #git
21:59 jfran joined #git
22:00 drodger joined #git
22:00 soreau Is it possible to perform git bisect on only (rc) tags? I want to bisect the kernel and was thinking the rc tags would be more apt to build and work
22:00 Bin4ry_ joined #git
22:01 rominronin joined #git
22:02 kadoban soreau: You can do whatever you want in a bisect script, so you could just skip every commit that's not a rc tag. All you'd need would be a test for that, which shouldn't be too hard, git describe should help.
22:02 corpix joined #git
22:03 soreau kadoban: ok thanks
22:04 italoacasas joined #git
22:04 boombatower joined #git
22:04 stux joined #git
22:08 SimonK joined #git
22:08 dopesong joined #git
22:11 blackwind_123 joined #git
22:11 drodger joined #git
22:14 ResidentBiscuit joined #git
22:15 zivester joined #git
22:17 stormlrd joined #git
22:20 cdown joined #git
22:21 ciampix joined #git
22:22 pr0ton joined #git
22:22 cdown_ joined #git
22:24 drodger joined #git
22:26 romerocesar joined #git
22:26 Sample joined #git
22:26 elsevero joined #git
22:28 Sample joined #git
22:29 drodger joined #git
22:31 nettoweb joined #git
22:31 oliverio joined #git
22:34 allcentury joined #git
22:35 btree joined #git
22:35 minibar joined #git
22:36 eletuchy joined #git
22:36 romerocesar joined #git
22:38 Orion3k joined #git
22:39 GavinMagnus joined #git
22:40 btree left #git
22:40 fahadash joined #git
22:42 ahr3n joined #git
22:43 SwiftMatt joined #git
22:44 denimsoft joined #git
22:44 orbitphreak joined #git
22:47 tvw joined #git
22:48 nettoweb joined #git
22:49 IWishIKnew joined #git
22:50 akushner joined #git
22:51 drodger joined #git
22:54 reim joined #git
22:56 axisys how do you lock a file for editing.. we sure don't want two people editing the same tacacs config file .. that could break tacacs
22:56 anu1 joined #git
22:56 netj joined #git
22:56 i7c No such thing as a lock in git.
22:56 hwrdprkns joined #git
22:57 dan2k3k4 joined #git
22:57 axisys so git probably is not the right VCS for tacacs config since tacacs server needs to read it everytime someone make a operation on the router ..
22:58 sctskw joined #git
22:58 axisys so if I change privilege level of one user, I need to make sure another person is modifying the file in the same section and pushing his change..
22:58 RoyK joined #git
22:58 axisys then my change may get reverted
22:59 eletuchy joined #git
22:59 i7c Enforcing a linear history comes close to that, maybe.
22:59 i7c Not sure about all the implications for your specific use case.
22:59 i7c !rebase
22:59 gitinfo 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
22:59 axisys i guess people uses a wrapper to lock the file and then make the edit and then do the git commit.. to prevent multiple change ..
23:00 RoyK probably an faq, but I submitted a git repo to github and later set my git.username, but it doesn't work
23:00 larsrustand joined #git
23:00 mkopriva joined #git
23:00 neunon joined #git
23:01 RoyK git config --global user.name 'myname'
23:01 RoyK still it asks me about it
23:01 i7c Setting the user name won't update commits that you already made before setting it.
23:02 rominronin joined #git
23:03 RoyK i7c: tried to a few more commits - same issue
23:03 i7c Maybe you have set a wrong value with git config (without --global) which would be a repository-specific setting.
23:03 i7c see what git config user.name says (with and without --global)
23:03 i7c afk, sorry →
23:05 Lorry_ joined #git
23:05 RoyK i7c: same thing
23:06 i7c For github it's important that you configure one of the email addresses as user.email
23:06 i7c otherwise it won't recognise you
23:06 i7c now really afk :)
23:06 ceaucari joined #git
23:07 evhan joined #git
23:07 evhan left #git
23:09 hwrdprkns joined #git
23:09 trelane joined #git
23:09 trelane joined #git
23:09 ceaucari joined #git
23:11 BSAlb joined #git
23:13 drodger joined #git
23:17 hwrdprkns joined #git
23:17 hahuang62 joined #git
23:21 Zadok joined #git
23:21 stormlrd joined #git
23:21 Rakko joined #git
23:22 Rakko On OS X I have git complaining about untracked files. I notice that all the untracked files have non-ASCII characters in their names. My LANG is en_US.UTF-8. How can I get git to recognize them as being the right files?
23:22 Rakko The repo is one I copies over whole from my Linux box (where no such problem happens). I also did git reset --hard HEAD and git clean -dfx on the Mac.
23:27 rkazak joined #git
23:28 ceaucari joined #git
23:28 Rakko My git on the problem system is 2.6.
23:28 Rakko My git on the problem system is 2.6.3
23:29 mrkake joined #git
23:31 jaguarmagenta joined #git
23:31 larsrustand_ joined #git
23:31 hwrdprkns joined #git
23:35 pr0ton joined #git
23:44 eletuchy_ joined #git
23:45 mablae_ joined #git
23:47 eletuchy joined #git
23:48 arescorpio joined #git
23:49 ceaucari joined #git
23:50 Mouaad left #git
23:51 eletuchy_ joined #git
23:54 eletuchy joined #git
23:56 eletuch__ joined #git
23:58 btcquant joined #git
23:58 eletuchy_ joined #git
23:59 drodger joined #git

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