Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-01

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

All times shown according to UTC.

Time Nick Message
00:03 xlegoman joined #git
00:03 tgies joined #git
00:06 eletuchy joined #git
00:06 eletuchy_ joined #git
00:07 meLon Using `git log` I see 'Merge: hash hash'.  Where can I find information about these hashes and what they represent?
00:08 tgies joined #git
00:09 eletuch__ joined #git
00:09 preaction meLon: those are the individual commits that are merged by the current commit
00:11 meLon preaction: Thanks.  I'm trying to figure out how to revert multiple commits/merges and started running into issues.  Was thinking having a better understanding of that might help out.  Lets see, and thanks :D
00:11 ryouma Eugene: hmm :p
00:11 ryouma Eugene: hmm :(
00:12 eletuchy joined #git
00:13 plujon` joined #git
00:13 tgies joined #git
00:13 plujon` left #git
00:14 eletuchy_ joined #git
00:15 Lyqyd joined #git
00:16 interne7y joined #git
00:16 monstermac77 joined #git
00:16 italoacasas joined #git
00:17 eletuchy joined #git
00:17 drodger joined #git
00:19 tristanp joined #git
00:19 wariac joined #git
00:19 eletuch__ joined #git
00:20 Rodya_ joined #git
00:20 njbair joined #git
00:21 ceaucari joined #git
00:21 monstermac77 Hi all, I’m trying to rename my master branch ('git branch -m master liveBranch'), create a new branch 'git branch devBranch', then clone the repo (call it repo A) in another folder on the same computer (call it repo B). But when I do so, if I do a 'git branch -a' on repo B, it shows the HEAD of repo A to be pointing to devBranch even though 'git b
00:21 monstermac77 ranch -a' on repo A claims that liveBranch is checked out. Thoughts?
00:22 eletuchy joined #git
00:22 tgies joined #git
00:24 eletuchy_ joined #git
00:24 fstd joined #git
00:25 L8D joined #git
00:26 liquidjamm joined #git
00:26 eletuch__ joined #git
00:28 tgies joined #git
00:28 eletuchy joined #git
00:29 deltab monstermac77: since both branches are on the same commit, aren't they both right?
00:29 monstermac77 Hm, that's a good point (no pun intended).
00:30 ryouma can i get the first hash that is in the current branch since a given time?
00:31 tomog999_ joined #git
00:31 eletuchy_ joined #git
00:33 tgies joined #git
00:33 drodger joined #git
00:34 eletuchy joined #git
00:35 ojacobson first?
00:36 qpdb joined #git
00:37 monstermac77 deltab: I just tested by making a commit on one branch, but the disconnect is still happening, even after a git fetch.
00:39 deltab no idea, sorry
00:39 monstermac77 That is, repo A says that branch X is checked out, while repo B (which was cloned from A) says origin's HEAD is pointing to branch Y.
00:40 monstermac77 Darn, thanks though.
00:41 ryouma ojacobson: i want to fake a git diff --since
00:42 tgies joined #git
00:43 durham_ joined #git
00:43 txdv_ joined #git
00:47 ceaucari joined #git
00:47 Thorn joined #git
00:47 Ardethian\work joined #git
00:47 tgies joined #git
00:48 SwiftMatt joined #git
00:52 sdothum joined #git
00:52 tgies joined #git
00:53 Fr0Master left #git
00:55 zivester joined #git
00:56 aspiers joined #git
00:57 durham joined #git
00:57 Noldorin joined #git
00:57 italoacasas joined #git
00:57 tgies joined #git
01:00 sargas joined #git
01:01 rkazak joined #git
01:02 mattp_ joined #git
01:04 moei joined #git
01:05 LeBlaaanc joined #git
01:05 dermoth joined #git
01:07 tgies joined #git
01:08 tristanp joined #git
01:08 BombStrike joined #git
01:10 ochorocho__ joined #git
01:11 fission6 joined #git
01:13 tgies joined #git
01:14 durham_ joined #git
01:18 tgies joined #git
01:18 Sleepy63 joined #git
01:19 garyserj joined #git
01:19 mizu_no_oto joined #git
01:20 fstd joined #git
01:21 livingstn joined #git
01:22 sha1sum joined #git
01:22 douglasc_ joined #git
01:24 sangy joined #git
01:25 netj joined #git
01:26 star_pro_ joined #git
01:33 dopesong joined #git
01:33 Tanger_ joined #git
01:35 Rodya_ joined #git
01:35 drodger joined #git
01:35 dermoth joined #git
01:35 DirtyCajun joined #git
01:37 Rodya_ joined #git
01:38 tgies joined #git
01:38 mda1 joined #git
01:38 pks joined #git
01:42 Limes_ joined #git
01:46 tgies joined #git
01:46 jstimm_ joined #git
01:46 faux___ joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and necessary violence | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | The beatings will continue until the jokes improve! https://madeitwor.se/git-jokes
01:51 nivag joined #git
01:55 drodger joined #git
01:55 ensyde__ joined #git
01:56 whitby joined #git
01:58 harish_ joined #git
02:03 Goplat joined #git
02:03 eletuchy_ joined #git
02:05 eletuch__ joined #git
02:07 inflames joined #git
02:08 tgies joined #git
02:08 eletuchy joined #git
02:11 dimi1947 joined #git
02:11 dreiss joined #git
02:12 eletuchy_ joined #git
02:13 tgies joined #git
02:13 mizu_no_oto joined #git
02:13 eletuch__ joined #git
02:17 eletuchy joined #git
02:17 interne7y joined #git
02:18 tgies joined #git
02:18 drodger joined #git
02:19 eletuchy_ joined #git
02:19 hexagoxel joined #git
02:20 sargas joined #git
02:20 MattMaker joined #git
02:21 exawatts joined #git
02:22 grill joined #git
02:23 tgies joined #git
02:24 Kaisyu joined #git
02:26 L8D joined #git
02:27 dodobrain ryouma, did you get your question answered? git log --oneline --since="May 24" --reverse | head -n1
02:27 douglascorrea joined #git
02:28 tgies joined #git
02:29 dodobrain ryouma, that should give you the first commit since that date. you can control format if you want to change the output from log, or simply get rid of --online and it will get you only the full commit hash
02:33 tgies joined #git
02:34 harish_ joined #git
02:36 drodger joined #git
02:37 zaphomet joined #git
02:38 tgies joined #git
02:40 snufft joined #git
02:41 chachasmooth joined #git
02:42 ryouma dodobrain: thanks!  then i can mabye do something like "git diff `git log --since midnight`.." (tries)
02:43 tgies joined #git
02:43 dodobrain its a shame that -n and --reverse don't work in the usual sense
02:44 dodobrain i.e. git log -3 will listr the most recent 3 commits regardless of whether --reverse was provided
02:44 ryouma dodobrain: git diff `git log --oneline --since midnight --reverse | print first column|head -1`..
02:44 dodobrain are you always after the first commit hash?
02:45 dodobrain if yes, forget about --oneline and get rid of the print first col
02:45 dodobrain git log --since ... --reverse | head -n1
02:45 dodobrain thats your full commit hash
02:48 tgies joined #git
02:50 ryouma dodobrain: yes, that works.  still need to grab the hash column though.  thank you!
02:51 ryouma dodobrain: solution is git diff $(git log --since midnight --reverse | col2 | head -1)
02:53 david007 joined #git
02:53 tgies joined #git
02:54 dodobrain what hash column? use --format="%h" and get rid of the col2
02:54 ajf- joined #git
02:54 ryouma ah
02:54 dodobrain if you want the full hash, its %H
02:55 ryouma works
02:56 dodobrain and that head/tail stuff is not needed if --reverse was applied *after* commit limiting
02:56 dodobrain oh well, that will create a different set of problems
02:56 ajf- joined #git
02:57 drodger joined #git
02:57 dodobrain wait that came out wrong
02:57 MattMaker joined #git
02:57 dodobrain if reverse was applied *before* commit limiting is what i meant to type
02:57 tristanp joined #git
02:58 ryouma which i presume it isn't?
02:58 douglasc_ joined #git
02:58 ajf- joined #git
02:58 dodobrain yes, commit limiting is applied *before* ordering and formatting options
02:58 ryouma i.e. i can't do --reverse -n1?
02:59 dodobrain yeah --reverse -n1 and -n1  will give the exact same output
02:59 dodobrain err.. it is -1
02:59 ryouma strange
02:59 dodobrain not -n1
02:59 dodobrain grr, i seem to be making a lot of mistakes today :(
03:00 dodobrain wait, it appears -n1 works too
03:00 dodobrain i didn;t know that
03:01 dodobrain today seems to be tipping towards 'bad day' for me
03:02 douglascorrea joined #git
03:02 arescorpio joined #git
03:03 tgies joined #git
03:03 aavrug joined #git
03:05 douglascorrea joined #git
03:07 L8D joined #git
03:08 tgies joined #git
03:08 dadada_ joined #git
03:10 drodger joined #git
03:11 ochorocho__ joined #git
03:11 jason237 joined #git
03:13 Genome36 joined #git
03:13 Genome36 hello guys
03:13 tgies joined #git
03:13 Genome36 im having an issue with my repository
03:13 Genome36 one of the branches has 3 commits
03:13 Genome36 and 2 of em display the same data
03:14 Genome36 and it so happen tat "git fsck --full" reports a corrupted object
03:15 bitkiller joined #git
03:15 Genome36 here is the output of the command http://www.pasteall.org/70132
03:15 Genome36 how can i fix ?
03:16 diegoaguilar joined #git
03:18 rewt Genome36, re-clone from an uncorrupted repo
03:18 Genome36 rewt: that'S it ?
03:18 tgies joined #git
03:18 Genome36 ok then, ty rewt
03:19 drodger joined #git
03:20 k3rn31 joined #git
03:23 sha1sum joined #git
03:23 tgies joined #git
03:26 mehola joined #git
03:29 djb-irc joined #git
03:30 CEnnis91 joined #git
03:30 garyserj joined #git
03:33 tgies joined #git
03:35 hahuang61 joined #git
03:35 diegoviola joined #git
03:35 DanZ3 joined #git
03:36 prsn_ joined #git
03:36 eletuchy joined #git
03:36 drodger joined #git
03:37 HenriettaSalt joined #git
03:38 tgies joined #git
03:39 astrofog joined #git
03:39 eletuchy_ joined #git
03:40 Genome36 left #git
03:41 eletuch__ joined #git
03:41 drodger joined #git
03:42 dodobrain joined #git
03:43 eletuchy joined #git
03:43 tgies joined #git
03:44 prsn joined #git
03:44 dodobrain joined #git
03:47 eletuchy_ joined #git
03:49 eletuch__ joined #git
03:49 tgies joined #git
03:49 diegoaguilar joined #git
03:51 eletuchy joined #git
03:52 mattcen joined #git
03:53 jorge joined #git
03:53 eletuchy_ joined #git
03:54 tgies joined #git
03:55 Calrik joined #git
03:55 MattMaker joined #git
03:56 eletuchy joined #git
03:56 armyriad joined #git
03:59 tgies joined #git
04:00 eletuchy_ joined #git
04:02 d4rklit3 joined #git
04:03 jorge_epc joined #git
04:03 eletuchy joined #git
04:04 tgies joined #git
04:06 eletuchy_ joined #git
04:06 rkazak joined #git
04:09 tgies joined #git
04:09 choki joined #git
04:10 netj joined #git
04:10 eletuchy joined #git
04:13 armyriad joined #git
04:14 jorge_epc joined #git
04:14 tgies joined #git
04:15 LeBlaaanc joined #git
04:16 eletuchy joined #git
04:18 jorge_epc Hi, I am kind of new in git for mac. I want to know if there is any autocomplete solution for the terminal?
04:19 tgies joined #git
04:19 EmployeeNumber7 joined #git
04:19 interne7y joined #git
04:20 espindola joined #git
04:20 EmployeeNumber7 How would I merge a branch in a remote repository into a branch on a local repository?
04:21 Dro joined #git
04:21 drodger joined #git
04:21 EmployeeNumber7 I do not have one of the branches in my local repository
04:21 LeBlaaanc joined #git
04:23 harish_ joined #git
04:24 tgies joined #git
04:26 Sasazuka joined #git
04:26 howdoi joined #git
04:26 mariuscc joined #git
04:28 Sasazuka joined #git
04:28 subhojit777 joined #git
04:29 tgies joined #git
04:30 Cabanossi joined #git
04:33 blackwind_123 joined #git
04:34 tgies joined #git
04:36 EmployeeNumber7 Is anyone alive in here?
04:37 MattMaker joined #git
04:39 tgies joined #git
04:41 harish_ joined #git
04:43 mda1 joined #git
04:43 grawity we don't guarantee 5-minute replies here
04:43 grawity git fetch, git merge
04:44 grawity or, for that matter, git pull
04:44 tgies joined #git
04:45 fscala joined #git
04:46 mda1 joined #git
04:46 eletuchy joined #git
04:47 orbitphreak joined #git
04:48 EmployeeNumber7 Thanks
04:48 jaguarmagenta joined #git
04:49 Dro joined #git
04:53 mohabaks joined #git
04:53 tgies joined #git
04:54 mohabaks joined #git
04:55 moei joined #git
04:58 settermjd joined #git
04:59 faux___ joined #git
05:01 eletuchy joined #git
05:01 elsevero joined #git
05:03 cyan__ joined #git
05:03 tgies joined #git
05:07 guardianJ joined #git
05:09 tgies joined #git
05:12 ochorocho__ joined #git
05:13 clemf joined #git
05:13 beagleGuy joined #git
05:14 tgies joined #git
05:17 clemf joined #git
05:20 interne7y joined #git
05:23 clemf joined #git
05:24 tgies joined #git
05:24 lindenle joined #git
05:26 nnyk_ joined #git
05:26 sha1sum joined #git
05:26 dopesong joined #git
05:28 guardianJ left #git
05:29 tgies joined #git
05:29 Raging_Hog joined #git
05:31 L8D joined #git
05:33 mwhooker joined #git
05:33 ThomasLocke joined #git
05:34 tgies joined #git
05:39 tgies joined #git
05:42 SuperflyR6 joined #git
05:42 espindola joined #git
05:44 tgies joined #git
05:44 Mowgli joined #git
05:45 eletuchy joined #git
05:48 dreiss joined #git
05:49 Repox joined #git
05:49 tgies joined #git
05:49 eletuchy_ joined #git
05:49 slacker_d joined #git
05:49 slacker_d left #git
05:52 nadim joined #git
05:52 eletuchy joined #git
05:54 sauvin joined #git
05:54 eletuch__ joined #git
05:54 qt-x joined #git
05:55 zeroed joined #git
05:55 guardianJ joined #git
05:56 lindenle joined #git
05:57 eletuchy joined #git
05:58 nidr0x joined #git
05:58 clemf joined #git
05:59 tgies joined #git
05:59 Macaveli joined #git
06:00 eletuchy_ joined #git
06:05 eletuchy joined #git
06:06 ensyde__ joined #git
06:06 rscata joined #git
06:06 yuhlw joined #git
06:07 star_prone joined #git
06:07 mwhooker joined #git
06:07 ensyde joined #git
06:08 heroux joined #git
06:08 tgies joined #git
06:08 eletuchy_ joined #git
06:09 frankier joined #git
06:10 infra-red joined #git
06:10 dsdeiz joined #git
06:10 eletuch__ joined #git
06:14 tgies joined #git
06:14 eletuchy joined #git
06:14 droidicus joined #git
06:15 a_thakur joined #git
06:16 yuhlw joined #git
06:16 eletuchy_ joined #git
06:18 Ozd joined #git
06:18 jaguarma_ joined #git
06:18 Ozd how can i clear all local changes and sync all my branches with the git repo? i dont need to save any local changes
06:18 ciampix joined #git
06:19 Ozd just accidentally run a merge without updating and now it has some serious problems
06:19 tgies joined #git
06:19 blahdodo joined #git
06:19 eletuchy joined #git
06:21 jagob joined #git
06:21 nnyk_ joined #git
06:21 settermjd joined #git
06:22 eletuchy_ joined #git
06:22 Thorn__ joined #git
06:22 kadoban Ozd: A merge only modifies one branch. You can reset that branch to what's at the upstream with something like … 'git reset --hard @{u}' should be. Make sure the branch is checked out first!
06:22 freimatz joined #git
06:23 MeltedLux joined #git
06:24 eletuchy joined #git
06:24 tgies joined #git
06:25 lamppid joined #git
06:25 L8D joined #git
06:25 Ozd kadoban, thanks that did the trick
06:26 eletuch__ joined #git
06:26 Ozd btw the error was probably because of git being unable to modify files that are in use by the web server when switching branches
06:26 Ozd just tried to create the case again, after resetting...
06:27 JeroenT joined #git
06:27 lamppid joined #git
06:28 lamppid joined #git
06:29 tgies joined #git
06:29 kadoban Ozd: I wouldn't think any kind of setup like that would be recommended by many people, there's no reason your live site should even be a git repo. Deployment should generally be done separately from git anyway, and if you're modifying your live site directly, something is usually about to go terribly.
06:29 eletuchy joined #git
06:29 lamppid joined #git
06:29 orbitphreak joined #git
06:30 mwhooker joined #git
06:30 theskillwithin joined #git
06:30 Ozd kadoban, i am running local dev on git repo, that watches for changes and redeploys itself
06:31 eletuchy_ joined #git
06:31 leehambley joined #git
06:33 harish_ joined #git
06:33 eletuch__ joined #git
06:36 Alienpruts joined #git
06:36 josuebrunel joined #git
06:36 eletuchy joined #git
06:37 tHEMtZ joined #git
06:38 eletuchy_ joined #git
06:39 tgies joined #git
06:40 cyan__ joined #git
06:42 eletuchy joined #git
06:43 Vgr joined #git
06:44 jceb joined #git
06:44 pontre2k left #git
06:45 eletuchy_ joined #git
06:47 eletuch__ joined #git
06:47 star_prone joined #git
06:48 Vgr joined #git
06:48 txdv_ left #git
06:49 Sceorem joined #git
06:49 tgies joined #git
06:49 eletuchy joined #git
06:49 d0nn1e joined #git
06:50 solars joined #git
06:50 baraba joined #git
06:54 eletuchy_ joined #git
06:56 eletuch__ joined #git
06:56 tristanp joined #git
06:58 DaVu joined #git
06:59 twb joined #git
06:59 tgies joined #git
06:59 twb GNU sort has -V, which sorts "like version numbers" --- 0.2 < 0.10 < 1.0
06:59 eletuchy joined #git
06:59 twb Can I get that "built in" in git tag output?
07:00 twb I can do "git tag | sort -V | column", but I'd rather git did it for me
07:01 eletuchy_ joined #git
07:03 rbr joined #git
07:03 ki0 joined #git
07:04 eletuch__ joined #git
07:04 tgies joined #git
07:05 Mowgli joined #git
07:06 Rish joined #git
07:07 eletuchy joined #git
07:09 eletuchy_ joined #git
07:09 tgies joined #git
07:12 fracting joined #git
07:12 DaVu left #git
07:12 eletuchy joined #git
07:12 ochorocho__ joined #git
07:13 SimonNa joined #git
07:14 Ozd joined #git
07:14 tgies joined #git
07:15 Fijit joined #git
07:15 rominronin joined #git
07:16 infra-red joined #git
07:18 GavinMagnus joined #git
07:20 L8D joined #git
07:21 douglascorrea joined #git
07:21 jagob joined #git
07:22 interne7y joined #git
07:22 mkoskar joined #git
07:24 tgies joined #git
07:25 elastix joined #git
07:27 sha1sum joined #git
07:29 Balliad joined #git
07:29 tgies joined #git
07:30 GavinMagnus left #git
07:30 Gonzo89 joined #git
07:30 ramsub07 joined #git
07:32 WayToDoor joined #git
07:33 fwdit joined #git
07:33 GavinMagnus joined #git
07:34 mozzarel1 joined #git
07:34 tgies joined #git
07:35 dimi1947 joined #git
07:35 GavinMagnus left #git
07:36 DevAntoine joined #git
07:38 grawity tag.sort, --sort=version:refname
07:38 twb Ooh
07:39 DevAntoine hi
07:40 ahmedelgabri joined #git
07:42 twb grawity: hrm, that's not DWIMming
07:42 troulouliou_div2 joined #git
07:42 twb http://sprunge.us/ScUO
07:43 kurkale6ka joined #git
07:43 twb I think it's just the handling of that repo's ~beta without being able to use ~ because tags
07:43 fracting joined #git
07:43 twb Test repo is git://github.com/sphinx-doc/sphinx BTW
07:44 twb Also, no difference between these: diff -U99  <(git tag) <(git tag --sort=version:refname)
07:44 fees joined #git
07:45 grawity try versionsort.prereleaseSuffix as well
07:46 a3Dman joined #git
07:46 twb bleh.  I'll just make a note of that and call version:refname good enough for now, and wait until it annoys me again :P
07:46 jceb joined #git
07:46 * twb goes back to what he's supposed to be doing
07:47 jbitdrop joined #git
07:47 Rish_ joined #git
07:47 TomyWork joined #git
07:49 tgies joined #git
07:50 rchavik joined #git
07:50 r00twrh joined #git
07:51 guardianJ joined #git
07:52 dsantiago joined #git
07:52 nnyk_ joined #git
07:54 infra-red joined #git
07:54 tgies joined #git
07:54 m1dnight_ joined #git
07:55 PCatinean joined #git
07:56 GavinMagnus joined #git
07:59 boingy joined #git
07:59 tgies joined #git
08:00 djb-irc joined #git
08:01 prsn joined #git
08:02 courrier joined #git
08:03 guardianJ left #git
08:03 SuperflyR6 joined #git
08:09 _pix joined #git
08:09 tgies joined #git
08:11 JeroenT joined #git
08:12 emPi joined #git
08:13 eletuchy joined #git
08:14 L8D joined #git
08:14 tgies joined #git
08:15 infra-red joined #git
08:16 sha1sum joined #git
08:16 marcogmonteiro joined #git
08:17 ahmedelgabri joined #git
08:17 ximvan joined #git
08:20 bongjovi joined #git
08:21 zeroed joined #git
08:22 shafox joined #git
08:23 shafox I have a commit id which is this ce3d995a98a9a74b5ae964c82bb679bd3efc0ba0, the repository contains several dir. Is there any way to restore a certain dir correspond to that commit id ?
08:23 interne7y joined #git
08:23 twb shafox: git checkout ce3d995 -- src/frobozz/
08:24 ocbtec joined #git
08:24 twb If you add a -p it'll prompt you as you go
08:24 tgies joined #git
08:25 shafox twb, thanks let me try this.
08:26 shafox great it worked. thank you so much twb :)
08:26 chll joined #git
08:28 uytutrytr675 joined #git
08:29 tgies joined #git
08:30 Thorn joined #git
08:33 ramsub07 joined #git
08:35 JeroenT joined #git
08:35 TheVoid joined #git
08:36 mischat joined #git
08:38 Ediz joined #git
08:39 weckl joined #git
08:40 JeroenT joined #git
08:41 a_thakur joined #git
08:41 Panacea joined #git
08:41 CEnnis91 joined #git
08:44 Lunatrius joined #git
08:44 tgies joined #git
08:49 tgies joined #git
08:50 notebox joined #git
08:50 JeroenT_ joined #git
08:54 eletuchy joined #git
08:54 iLembus joined #git
08:54 JeroenT joined #git
08:54 tgies joined #git
08:57 SimonK joined #git
08:57 MattMaker joined #git
08:58 Ozd joined #git
08:58 hendry joined #git
08:58 jaguarmagenta joined #git
08:59 JeroenT joined #git
08:59 King_Hual joined #git
09:00 subhojit777 joined #git
09:02 prsn joined #git
09:04 tgies joined #git
09:06 Jellyg00se joined #git
09:07 Thorn__ joined #git
09:08 L8D joined #git
09:09 Calrik joined #git
09:09 cdown joined #git
09:09 tgies joined #git
09:12 cdown_ joined #git
09:13 achadwick joined #git
09:13 ochorocho__ joined #git
09:14 tgies joined #git
09:17 mda1 joined #git
09:17 kvguay joined #git
09:19 tgies joined #git
09:22 acetakwas joined #git
09:22 lindenle joined #git
09:23 Robdgreat joined #git
09:23 jceb joined #git
09:24 douglascorrea joined #git
09:24 ahmedelgabri joined #git
09:25 tgies joined #git
09:25 iLembus_ joined #git
09:26 JeroenT joined #git
09:26 ferr joined #git
09:27 iktbbj joined #git
09:28 fracting joined #git
09:29 frankier joined #git
09:30 tgies joined #git
09:30 a_thakur joined #git
09:32 ramsub07 joined #git
09:33 dsdeiz joined #git
09:33 MattMaker joined #git
09:33 bloxbloxbloxblox joined #git
09:35 tgies joined #git
09:35 notebox joined #git
09:37 JeroenT joined #git
09:40 mattcen joined #git
09:41 mda1 joined #git
09:41 sdothum joined #git
09:43 bruce_lee joined #git
09:43 bruce_lee joined #git
09:44 tgies joined #git
09:45 thiago joined #git
09:46 Panacea joined #git
09:46 mda1 joined #git
09:48 eletuchy joined #git
09:48 star_pro_ joined #git
09:48 theskillwithin joined #git
09:49 tgies joined #git
09:52 elastix joined #git
09:59 Macaveli joined #git
09:59 tgies joined #git
10:01 elastix joined #git
10:02 L8D joined #git
10:03 ocbtec joined #git
10:03 ahmedelgabri joined #git
10:03 prsn joined #git
10:05 tgies joined #git
10:06 jerv joined #git
10:07 jerv How does git find the lowest common ancestor of two commits? Is there a smarter way than to just scan up?
10:07 parasite joined #git
10:08 mehola joined #git
10:08 irco joined #git
10:09 MattMaker joined #git
10:12 osse jerv: that's what git has to do under the hood. you as a user can use git merge-base
10:12 jerv osse: I am talking about under the hood. So it literally just scans up to find them, no smart data structures in place to optimize this process?
10:14 osse jerv: I don't know. there is an "API" that takes care of it.
10:14 osse if you like the nitty gritty here it is: https://github.com/git/git/blob/master/revision.h
10:14 tgies joined #git
10:16 osse Maybe there are some heuristics, but afaik the git "database" doesn't store anything that could be used as some sort of shortcut
10:17 SimonNa joined #git
10:18 artemisart joined #git
10:20 tgies joined #git
10:22 ramsub07 joined #git
10:25 interne7y joined #git
10:25 tgies joined #git
10:27 rahtgaz joined #git
10:31 ahmedelgabri joined #git
10:32 Psychiatrist joined #git
10:36 scoobertron joined #git
10:37 WayToDoor joined #git
10:38 JeroenT joined #git
10:39 EY__ joined #git
10:42 leehambley joined #git
10:44 tgies joined #git
10:46 MattMaker joined #git
10:46 snufft joined #git
10:47 Panacea joined #git
10:49 maucar joined #git
10:49 eletuchy joined #git
10:50 tgies joined #git
10:50 Repox joined #git
10:53 jceb joined #git
10:55 tgies joined #git
10:56 fission6 joined #git
10:56 L8D joined #git
10:56 myme joined #git
10:59 jaguarmagenta joined #git
11:00 a_thakur joined #git
11:00 tgies joined #git
11:00 lamppid joined #git
11:01 lamppid joined #git
11:01 tlaxkit joined #git
11:04 prsn joined #git
11:05 jackburton joined #git
11:09 mehola joined #git
11:14 mdw joined #git
11:14 ochorocho__ joined #git
11:14 drodger joined #git
11:14 tgies joined #git
11:15 tvw joined #git
11:16 k3rn31 joined #git
11:20 tgies joined #git
11:21 PCatinean joined #git
11:22 MattMaker joined #git
11:22 rnsanchez joined #git
11:22 _ng joined #git
11:23 digidog joined #git
11:25 tgies joined #git
11:25 elastix joined #git
11:26 interne7y joined #git
11:26 douglascorrea joined #git
11:26 dimi1947 joined #git
11:29 isxek joined #git
11:30 daveomcd joined #git
11:30 JeroenT_ joined #git
11:30 tgies joined #git
11:31 fracting joined #git
11:31 eijk joined #git
11:31 idmistir joined #git
11:31 idmistir joined #git
11:33 AlexRussia joined #git
11:33 NeverDie joined #git
11:34 k3rn31 joined #git
11:34 jackburton joined #git
11:35 AlexRussia Hello! I have strange problem. When I accessing though ssh to my work pc, I have troubles to writing commit messages or read git log since vim start behavior in strange, unreproduceble outside of git behavior, for example, git log: https://i.imgur.com/zmNkDZx.png vs git log | view - : https://i.imgur.com/xq13Dx1.png both is open view, but the last time displaying is right. the same is when I try to commit.
11:35 AlexRussia how can I fix that?
11:35 tgies joined #git
11:37 cbreak AlexRussia: looks like you have some forcing going on
11:37 cbreak check git config
11:38 cbreak maybe some color.* set to something other than auto?
11:38 cdown joined #git
11:38 eletuchy_ joined #git
11:38 AlexRussia cbreak: what should I check?
11:38 star_prone joined #git
11:39 cbreak does git config -l show entries about color?
11:39 jbu joined #git
11:39 robbyoconnor joined #git
11:39 cbreak if those are set to always, it might be bad
11:40 jbu anyone know if `git difftool` can view all diffs between local and origin?
11:40 AlexRussia cbreak: only for log alias, but not for commit
11:40 AlexRussia cbreak: but behavior is the same
11:41 cbreak AlexRussia: it should be set to true (or auto)
11:41 AlexRussia cbreak: core.colour?
11:41 cbreak AlexRussia: also, check that your flags for less are set correctly
11:41 cbreak AlexRussia: there are many color options
11:41 cbreak export LESS="-FXRS -x4"
11:41 cbreak this is what I have here
11:41 AlexRussia cbreak: I don't use less, only view(which maps to vim) and vim
11:42 King_Hual joined #git
11:42 cbreak hmm. so you'll have to find out how to convince vim to interprete the color codes
11:43 cbreak git log | ... and git log act differently, the latter uses your pager. It might also act differently with respect to color codes
11:43 AlexRussia cbreak: git config -l seems like this https://gist.github.com/a975​7414b1c195e8a5b8e9fc0fe11eed
11:43 cbreak no color options :(
11:43 AlexRussia cbreak: yes, BUT git log has core.pager set to 'view -'
11:43 AlexRussia cbreak: that's bad?
11:43 cbreak I don't think so
11:44 AlexRussia cbreak: but for test, what should I set i true u said?
11:44 cbreak you should try it with false
11:45 cbreak git config color.ui=false I think
11:45 AlexRussia cbreak: what do u mean, sorry, I don't understand :(
11:45 AlexRussia ?
11:45 AlexRussia ah
11:45 AlexRussia okay
11:45 tgies joined #git
11:45 AlexRussia thanks
11:45 mizu_no_oto joined #git
11:46 AlexRussia cbreak: nope, with false still the same
11:46 cbreak and git log --no-color?
11:46 NeverDie_ joined #git
11:46 AlexRussia cbreak: nope, the same :'(
11:47 AlexRussia cbreak: I met one strange thing
11:47 cbreak maybe the escape sequences aren't from color then
11:47 AlexRussia cbreak: seems like when I do `git commit` it opens file somehow else that I just do, since `set fileencoding` is unset at all!
11:47 cbreak can't think of anything else that would use them though
11:47 peey joined #git
11:47 qt-x joined #git
11:47 cbreak AlexRussia: git commit creates a temp file
11:48 AlexRussia cbreak: yeah, sure, but anyway encoding by default for new files is set
11:48 johnmilton joined #git
11:48 AlexRussia cbreak: or for any other
11:48 mashmort joined #git
11:48 cbreak maybe vim handles the file specially
11:48 AlexRussia i hope not
11:49 NeverDie joined #git
11:49 AlexRussia I tried to save the file, I tried to save session with it, but anyway it's load right and I can type correct anything
11:50 tgies joined #git
11:51 peey How should I go about including a local git repo on my machine as a submodule on a superproject that has a remote url?
11:51 cbreak AlexRussia: if you have problems with git commit specifically, you can use -m
11:52 AlexRussia cbreak: sure I can, but for long messages it's not very handful
11:52 cbreak or -F
11:52 AlexRussia OH
11:52 AlexRussia -F specifies commit file?
11:52 cbreak yes
11:52 AlexRussia I mean
11:52 AlexRussia nice
11:52 AlexRussia cbreak: thank you :)
11:53 peey I thought that "git submodule add" would copy the files over from my submodule and then I could push it to the remote url. But it seems that git wants the submodule's git repo to be accesible on remote machine of superproject/on a url accisible from the superproject's remotethat machine
11:53 cbreak no problem. weird though.
11:53 cbreak peey: submodules are separate repositories
11:54 peey That I understand
11:54 cbreak the only intersection points with the parent is that the parent records an url of them, and the commit hash that it wants of them
11:54 cbreak it does not store any history
11:54 peey So whenever I checkout, it needs to access the submodule repo in order to checkout from that hash?
11:55 cbreak peey: you have to ensure that every user that can clone the parent can also clone the submodule, yes
11:55 cbreak it might not have to communicate for that
11:55 cbreak but for the initial clone it has to
11:55 tgies joined #git
11:56 nnyk_ joined #git
11:56 peey Just for the initial clone?
11:56 prsn joined #git
11:57 peey The submodule is accessible to my superproject while it's on my machine, but it isn't accessible to it when I push the superproject to remote and that's the problem. Am I understanding correctly?
11:58 cbreak it has to be available for cloning and fetching
11:58 cbreak every user has to be able to clone both
11:59 eletuchy joined #git
11:59 peey Gotcha. Thanks!
12:00 gituser joined #git
12:00 sostenuto joined #git
12:03 {AS} joined #git
12:04 mdw joined #git
12:04 nettoweb joined #git
12:05 tgies joined #git
12:06 comps when exactly are stages in index used during merging? .. seems kind of useless w.r.t. the recursive strategy as you can't tell which tree came from which history (and can't detect criss-cross merges)
12:07 douglascorrea joined #git
12:07 sostenuto joined #git
12:08 lindenle joined #git
12:08 comps are they used only for the simple resolves OR as an API for external conflict resolutions (ie. via git-mergetool) ?
12:09 synthroid joined #git
12:09 EY joined #git
12:09 AlexRussia cbreak: LOL, the box was openly easily seems like
12:09 deepy joined #git
12:10 tgies joined #git
12:10 flaguy48 left #git
12:10 AlexRussia cbreak: just specify `set encoding=utf8` in your .vimrc and it's done
12:10 AlexRussia cbreak: idk where magic is hidden, but it works
12:11 cbreak oh, you have a weird non-utf8 locale? :(
12:11 kus joined #git
12:12 cbreak I have LESSCHARSET=utf-8 in my env vars, but that's for less of course, so wouldn't have helped you
12:12 Sceorem joined #git
12:12 sha1sum joined #git
12:13 mariuscc joined #git
12:13 synthroi_ joined #git
12:13 qt-x joined #git
12:15 AlexRussia cbreak: no, I have possibly right  locale
12:15 AlexRussia cbreak: and it's utf8
12:15 AlexRussia I hope...
12:15 AlexRussia must check it out
12:15 leeN joined #git
12:16 AlexRussia cbreak: but as I said outside git everything perfectly
12:18 dopesong joined #git
12:18 AlexRussia oh
12:18 AlexRussia cbreak: locale is just amazing
12:18 AlexRussia $ echo $LANG
12:18 AlexRussia ru_RU.UTF-8
12:19 cbreak hmm...
12:19 cbreak then vim ignores that?
12:20 tgies joined #git
12:20 douglascorrea joined #git
12:22 paul424 joined #git
12:23 flaguy48 joined #git
12:24 LBV_User joined #git
12:25 diegoaguilar joined #git
12:25 tgies joined #git
12:26 wrouesnel1 joined #git
12:26 interne7y joined #git
12:27 ocbtec joined #git
12:28 jeffreylevesque joined #git
12:30 tgies joined #git
12:30 qt-x joined #git
12:31 daveomcd joined #git
12:32 fstd joined #git
12:32 daveomcd I have a branch with changes right now, but it's for multiple different "features". I'm wanting to create a new branch and piece out the different features individually. How can I do this?
12:33 WayToDoor joined #git
12:34 avar create the branch and "git cherry-pick" the commits you want
12:35 JeroenT joined #git
12:35 zivester joined #git
12:35 daveomcd avar, ahh didn't think of that thanks! :)
12:35 tgies joined #git
12:35 fmcgeough joined #git
12:39 Petros2 joined #git
12:40 dermoth_ joined #git
12:40 happy-dude joined #git
12:40 tgies joined #git
12:40 mizu_no_oto joined #git
12:42 rgrinberg joined #git
12:42 zivester joined #git
12:45 tgies joined #git
12:47 t0by joined #git
12:47 star_prone joined #git
12:48 frankier joined #git
12:49 JeroenT_ joined #git
12:51 fahadash joined #git
12:51 robotroll joined #git
12:52 Akagi201 joined #git
12:53 bitkiller joined #git
12:53 fission6 joined #git
12:54 italoacasas joined #git
13:00 tgies joined #git
13:00 jaguarmagenta joined #git
13:00 cobra-the-joker joined #git
13:00 omot joined #git
13:01 eletuchy joined #git
13:01 cobra-the-joker Hey guys , i made a  bare repo , that i can push and pull , but when i push something ... the post-receive hook doesnt run
13:03 bibble left #git
13:03 lb cobra-the-joker !repro
13:03 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
13:03 i7c Maybe it's not executable?
13:03 omot left #git
13:04 fuchstronaut joined #git
13:04 CEnnis91 joined #git
13:04 LeMike joined #git
13:05 nneul joined #git
13:05 tgies joined #git
13:06 nneul Is there a way to set the fetch= value when using 'git remote add'? On some clones, I like to populate an https url by default, but also add a second remote pointing at the same tracking branches that uses ssh. I can easily add this by editing .git/config, but is there a way to do it with g-r-a?
13:08 jimi_ joined #git
13:09 cobra-the-joker i7c, lb, yes it is executable a+x ... https://gist.github.com/anonymous​/8b2c8a69f60a629990f8c159c07fc634 here is what i am trying to run
13:09 cobra-the-joker this is in my bare repository hook ... hooks/post-receive file
13:10 Dro joined #git
13:11 lb cobra-the-joker !xy
13:11 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
13:11 lb cobra-the-joker !deploy
13:11 gitinfo 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
13:12 mehola joined #git
13:12 espindola joined #git
13:12 LFS joined #git
13:12 Blkt joined #git
13:13 mbrzuzy joined #git
13:13 nettoweb joined #git
13:14 EY joined #git
13:14 bsanford joined #git
13:15 ochorocho__ joined #git
13:15 tgies joined #git
13:15 cobra-the-joker but lb, even echo >  statement doesn't run !
13:17 rnsanchez_ joined #git
13:17 dro2 joined #git
13:17 raijin joined #git
13:18 i7c You sure you push to the right repo?
13:18 i7c Also you can put echos in the hook and the output should appear on the client side git.
13:20 tgies joined #git
13:20 |meta joined #git
13:20 cobra-the-joker hmmm , it worked without the echo
13:21 droidicus joined #git
13:23 rgrinberg joined #git
13:23 lb cobra-the-joker https://dpaste.de/KF9t
13:23 lb works fine
13:23 lb check your process step by step
13:24 aard_ joined #git
13:25 AaronMT joined #git
13:25 tgies joined #git
13:25 lb ahh missed the -m with the commit part, but apart form that it fine
13:27 interne7y joined #git
13:27 a_thakur joined #git
13:28 bernalex anyone know of a good git annex guide for using git annex for art assets and other binary stuff? other than that, I want to use it essentially like I would have used regular git.
13:29 deadnull_ joined #git
13:29 yqt joined #git
13:29 lb bernalex maybe !annex helps
13:29 gitinfo git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
13:30 bernalex lb: ehm that's just the homepage of git-annex. there might be a useful guide in there somewhere though.
13:31 tgies joined #git
13:32 lb bernalex is http://git-annex.branchable.com/walkthrough/ not sufficient? i never used annex so i cannot point anywhere special
13:32 gitmigration joined #git
13:32 crose joined #git
13:33 bernalex lb: I guess I should have mentioned that that is what I'm looking at right now. :) I was just wondering if there were some write-ups from people who use it for art assets, and maybe discussed some pros and cons, elaborated on any GOTCHAs, or whatever.
13:33 jaguarmagenta joined #git
13:33 lb bernalex my point was more like "there are other tools as well" maybe they are more suitable for you
13:33 lb i see sorry :D
13:33 bernalex lb: yeah, I've seen some of them. not heard of git-lfs though, so I guess I'll have a look at those too. thanks!
13:34 lb git-lfs is pushed / used by github so it's a fairly big contributor
13:34 bernalex using git-annex is additionally tempting due to what lang it's written in, since that makes it easy for me to hack it and contribute patches upstream if needs be.
13:34 Rooxo joined #git
13:35 lb i see. there are some users here that use annex though. maybe they can help you more. maybe moritz or osse know more about it
13:35 Kicer86 joined #git
13:36 tgies joined #git
13:36 bernalex it's a bit problematic to ask any gamedev people, because they'll all say "just use perforce", and then call me names when I point out I don't want to run non-free software. :-P
13:36 bernalex I guess I'll read up on git-fat, git-media, git-lfs, and other git-blahs in addition to annex.
13:37 JJM joined #git
13:41 tgies joined #git
13:41 boudiccas joined #git
13:41 mylord_ joined #git
13:42 ash_workz joined #git
13:44 rwb joined #git
13:45 dsdeiz joined #git
13:45 dsdeiz joined #git
13:46 tgies joined #git
13:46 Dougie187 joined #git
13:47 dimi1947 joined #git
13:51 tgies joined #git
13:54 sangy joined #git
13:56 tgies joined #git
13:56 synthroid joined #git
13:57 dsdeiz_ joined #git
13:58 chll joined #git
13:58 chachasmooth joined #git
13:59 a_thakur joined #git
14:00 NeverDie joined #git
14:00 mdw joined #git
14:01 tgies joined #git
14:01 madewokherd joined #git
14:01 synthroi_ joined #git
14:03 deadnull_ joined #git
14:04 b_jonas How do I list all tags together with the id of the commit they point to, similarly to how (git branch -l -v) lists branches that way?
14:04 k3rn31 joined #git
14:05 L8D joined #git
14:05 star_prone joined #git
14:05 floatingpoint joined #git
14:07 lindenle joined #git
14:08 nurey joined #git
14:08 netj joined #git
14:08 toogley joined #git
14:11 tgies joined #git
14:11 cdg joined #git
14:12 fedexo joined #git
14:12 phaleth joined #git
14:12 ceaucari joined #git
14:13 mehola joined #git
14:13 GavinMagnus left #git
14:14 GavinMagnus joined #git
14:16 tgies joined #git
14:16 fracting joined #git
14:16 blackwind_123 joined #git
14:17 gajus silly question: when I create a new branch (using `git branch -b new-branch`) the branch is created from the current branch, right?
14:17 gajus assuming thats the case, how do I confirm it
14:17 osse gajus: that just prints 'error: unknown switch `b'' :P
14:18 osse gajus: you can confirm it e.g. by ''git show --decorate HEAD'
14:18 osse the parentheses next to the hash should contain both branch names
14:19 zincrokx joined #git
14:19 gajus sorry, checkout
14:21 tgies joined #git
14:22 PCatinean joined #git
14:23 b_jonas gajus: yes, it's created from the current branch
14:23 IWishIKnew joined #git
14:24 gajus 3f502cd35064562f44aaa3307d2d025bdc9a1721 (HEAD, origin/feature/use-sagas-for-login, feature/use-sagas-for-toolbox-module, feature/use-sagas-for-login) Add @todo tasks advising further refactoring
14:24 b_jonas gajus: you can confirm that by running (git rev-parse HEAD) to see which commit id is currently checked out (before or after the git branch), and run (git rev-parse new-branch) to tell which commit-id the branch currently points to (after the branch)
14:24 gajus Okay, so this means that I have branched from master, then from use-sagas-for-login and now I am in use-sagas-for-toolbox-module
14:24 gajus correct?
14:25 b_jonas gajus: if you run (git checkout -b new-branch) then you should have the new branch checked out, but you can check that by looking at the first message (git status) prints, eg. "On branch new-branch"
14:26 tgies joined #git
14:27 gajus Thank you
14:27 gajus `git log --pretty=oneline --decorate` makes the most sense to mek
14:27 mdw joined #git
14:28 b_jonas (alternately you can also run (git rev-parse --abbrev-ref --symbolic-full-name HEAD) to tell what branch you have checked out, without any of the other things git status prints, but that's quite an ugly incantation.)
14:28 interne7y joined #git
14:30 discopatrick joined #git
14:32 jerematic joined #git
14:36 faux___ joined #git
14:36 nnyk_ joined #git
14:38 Macaveli joined #git
14:40 tgies joined #git
14:41 JeroenT joined #git
14:42 Noldorin joined #git
14:43 PCatinean hey guys, if I have a remote repo and a fork that both have the same branch
14:43 PCatinean how can I switch between branches
14:43 JJM joined #git
14:43 PCatinean ah, just make a new one and track the fork's
14:43 PCatinean nvm
14:43 PCatinean :))
14:44 mohabaks joined #git
14:44 kpease joined #git
14:44 GavinMagnus git checkout upstream/branch
14:45 DTekk joined #git
14:45 Ali1 joined #git
14:45 tgies joined #git
14:45 drodger joined #git
14:46 mikecmpbll joined #git
14:46 GavinMagnus Supposing that upstream is the alias of the remote you forked on
14:48 joki joined #git
14:49 PCatinean It says I'm detached head
14:49 PCatinean because I also have 9.0 of the origin checked out
14:49 ramsub07 joined #git
14:50 tgies joined #git
14:51 zivester joined #git
14:52 quenode_ joined #git
14:54 GavinMagnus git branch NAME upstream/branch
14:54 GavinMagnus git checkout NAME
14:55 _pix joined #git
14:55 PCatinean ahh, thanks, did not know that
14:55 PCatinean :-s
14:55 clemf joined #git
14:56 tgies joined #git
14:56 PCatinean hm, I deleted some files ammended and tried to push
14:56 PCatinean it says it's up to date
14:58 GavinMagnus In one command-line : git checkout upstream/branch -b NAME
14:59 GavinMagnus Did you stash them?
14:59 PCatinean yes but I'm not sure this will fix my problem?
14:59 PCatinean no, it shows up in the local git history
14:59 PCatinean files deleted and all that and when doing git push upstream branch -f
14:59 PCatinean it just says up to date
15:00 charolastra joined #git
15:01 tgies joined #git
15:01 GavinMagnus Did you already push your patch on the previous branch?
15:01 peey joined #git
15:02 annoymouse joined #git
15:03 peey How can I clone a git repo into a subfolder my git project and let its files be added to commit history?
15:03 kilo_bravo joined #git
15:03 preaction peey: git subtree
15:04 peey Will look into that
15:04 grawity you can `git add dir/` to add just the files, instead of adding the repo
15:04 grawity better use subtree though
15:05 PCatinean GavinMagnus, yes
15:05 sangy joined #git
15:05 preaction subtree if you want to track those files and update them from the main repo later. otherwise yeah, doesn't matter
15:05 PCatinean what now? :))
15:05 cdown joined #git
15:06 GavinMagnus You should merge it though
15:06 bango2 joined #git
15:06 peey That's not really required though, but I'll still look at what subtree actually is before I decide. Thanks!
15:07 mystica555 joined #git
15:09 gitUser joined #git
15:09 mystica555 hm how would I go about setting up a repo of this:  i have a script; i have a version that has no custom changes for local use, which is public; the custom changes are private (namely adding our local snmp info for monitoring)  and i want to keep them updated based on the base version, and keep changes of our customizations also
15:10 venmx joined #git
15:10 mystica555 i can sort of get a visual model of this in my mind, but im not quite sure how i make git do this
15:10 tgies joined #git
15:10 mystica555 start from some base; have that be tracked; branch the local changes version; merge the base into the local version as i go along changing the base
15:11 mystica555 then if i modify the local changes one, i can still keep those modifications..
15:11 mystica555 then the question comes, how do i reasonably publish this public version to like github or something
15:11 peey mystica555: Is it possible to take out the common code as a "module" in your programming language itself? And then manage the two versions independently that "depend" on that module
15:11 mystica555 perhaps..
15:12 mystica555 the thing is the 'common' is 98% of the script
15:12 mystica555 i really have like 1 function to do the local changes
15:12 mystica555 perhaps i could have a simple 'if local_file; parse local_file'
15:12 mystica555 after all the generic stuff
15:12 charolastra joined #git
15:13 charolastra hi, i've started a project and halfway through the requirements changes so i made a tag, made a few changes on master to get the first project ready to deploy and then branched into project 2 and did some rought rework. now project 1 should
15:13 charolastra continue but also include some changes from project 2. what"s the usual way to deal with such a situation? checkout the tag and then cherry pick the required changes?
15:13 josuebrunel joined #git
15:14 peey You should definitely separate the common code so that you aren't struck duplicating changes from one to another when you make a change in common code
15:14 irco joined #git
15:15 ochorocho__ joined #git
15:15 madewokherd joined #git
15:15 tgies joined #git
15:16 b_jonas I've got an answer on another channel. (git tag --format "%(refname) %(objectname)") lists tags this way, or I can use (git for-each-ref --format "%(refname) %(objectname)" refs) to list both branches and tags.
15:16 charolastra true, but the damage is already done. also the changes were on the core so now it's two distinct projects with small additional changes
15:17 fscala joined #git
15:18 PCatinean hmm, still not working
15:18 LeBlaaanc joined #git
15:19 son joined #git
15:20 irco joined #git
15:20 venmx joined #git
15:21 JeroenT_ joined #git
15:21 tgies joined #git
15:22 dsdeiz joined #git
15:22 dsdeiz joined #git
15:29 interne7y joined #git
15:31 sha1sum_ joined #git
15:31 C4ta|Work left #git
15:32 dadada_ left #git
15:33 son joined #git
15:33 minot joined #git
15:34 jaguarmagenta joined #git
15:35 Rish joined #git
15:38 espindola joined #git
15:38 hashpuppy joined #git
15:39 bsanford joined #git
15:44 Ranhir joined #git
15:46 tgies joined #git
15:46 star_prone joined #git
15:48 corebits joined #git
15:51 tgies joined #git
15:51 eijk_ joined #git
15:52 jumpman So, I have a branch that hasn't been merged to Develop yet
15:52 netj joined #git
15:52 jumpman And I created a new branch for what I thought was a totally unrelated feature
15:52 jumpman But now I realize that I need the commits from the first branch... should I rebase my new branch on to that branch?
15:53 ToBeCloud joined #git
15:53 v0lksman joined #git
15:53 ToBeCloud joined #git
15:53 ToBeCloud joined #git
15:54 v0lksman hello all!  I have two branches that diverged a long time ago (master and dev lets say).  Dev is now ready to be master but I don't want to deal with merging, I just want dev to be named master and master re-named something like 'old'.  what is the best way to accomplish that?
15:54 ahmedelgabri joined #git
15:55 _ikke_ git branch -m master old; git branch -m dev master
15:55 Dong__ joined #git
15:55 v0lksman _ikke_: so just change their names?
15:55 v0lksman awesome!
15:55 synthroid joined #git
15:56 _ikke_ yeah
15:57 Dong__ Can anyone suggest some famous repo (better on Github) that has a pack file larger than 2GB and 4GB? I know that Linux repo is only 1.5GB.
15:57 grawity are you testing the clone/download, or local usage?
15:58 grawity because Linux has an additional third-party packfile containing the 0.x~2.6 history, which adds some extra 500 MB
15:58 rchavik joined #git
15:58 grawity err, no, I got that wrong; it's only ~200 MB
15:59 UTAN_dev_ joined #git
15:59 grawity well, https://bitbucket.org/braindamaged/openbsd-src.git should be around 2.5 GB
15:59 tristanp joined #git
15:59 UTAN_dev_ joined #git
16:00 r00twrh joined #git
16:00 Dong__ Great! Thanks a lot! Any one even bigger than 4G?
16:00 ToBeCloud joined #git
16:00 blackpajamas joined #git
16:01 t0by joined #git
16:02 Dong__ the openbsd thing has only 1.5million objects, while Linux got more than 3M
16:02 unbalancedparen joined #git
16:02 ToBeCloud joined #git
16:03 grawity try https://github.com/WebKit/webkit
16:03 Gamecubic joined #git
16:03 v0lksman _ikke_: so now how do I sync this back to origin (origin being a GitLab repo) do I just push origin master?
16:03 ToBeCloud joined #git
16:03 grawity I've no idea how large it is, though
16:03 v0lksman _ikke_: https://dpaste.de/D5M0
16:03 ToBeCloud joined #git
16:04 ToBeCloud joined #git
16:04 Dong__ I understand you can just commit a bunch of nonsense binary to enlarge it, but I'm more interested to find the real repo that is that large
16:04 mohabaks joined #git
16:04 ToBeCloud joined #git
16:06 tgies joined #git
16:06 mase-tech joined #git
16:07 imachuchu joined #git
16:08 ochorocho__ joined #git
16:09 nettoweb joined #git
16:09 dsdeiz joined #git
16:09 dsdeiz joined #git
16:11 tgies joined #git
16:12 SteffanW joined #git
16:14 Gloomy joined #git
16:14 JosephFerano joined #git
16:15 JosephFerano hello, I'm having issues with git-lfs, wanted to know if anyone else is having similar issues
16:16 JosephFerano On my machine (OSX), it works fine. It seems to be doing everything correctly, however, in the git bash that github desktop provides, it hangs on git status.
16:16 tgies joined #git
16:16 JosephFerano I have to press ctrl-c in order to stop it from hanging, I can do most operations, like git fetch, but git status hangs.
16:17 durham joined #git
16:17 JosephFerano Any idea what it might be, has anyone experienced this?
16:18 paul424 joined #git
16:20 Ahmed90 joined #git
16:20 espindola joined #git
16:21 tgies joined #git
16:21 subhojit777 joined #git
16:22 mischat_ joined #git
16:22 gasche joined #git
16:22 gasche Hi
16:22 gitinfo gasche: 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.
16:23 Peuc joined #git
16:23 gasche my git 2.5.5 is unable to clone the Cairo git repository, but it works under either 2.4.1 and 2.8.1
16:23 Rooxo joined #git
16:23 gasche should I report this as a bug upstream? 2.5.5 is a recent maintenance release of the 2.5.x branch, and this could be fixed in another such maintenance release
16:24 gasche (I haven't tested with other git versions on the 2.5.x branch or 2.6.x, etc.)
16:24 Pyrogerg joined #git
16:25 Dong__ grawity: interestingly bitbucket disconnected me in the middle of receiving packs.
16:26 shinnya joined #git
16:26 dopesong joined #git
16:26 kadoban joined #git
16:26 tgies joined #git
16:26 TomyLobo joined #git
16:26 Pyrogerg joined #git
16:28 toogley joined #git
16:28 paul424 joined #git
16:28 compeman joined #git
16:28 ramsub07 joined #git
16:28 irco joined #git
16:31 charolastra_ joined #git
16:31 Panacea joined #git
16:31 tgies joined #git
16:33 jamiejackson joined #git
16:34 sha1sum joined #git
16:34 jamiejackson hi folks. i've submitted a pull request to a github project that hasn't been merged yet. i have new work that is based on those changes. what's the best way to branch for the new work?
16:35 gasche jamiejackson: branch from the PR's branch?
16:36 jamiejackson okay, gasche, thanks
16:37 gasche if you rebase the PR's branch against the project master as part of your development, remember to also git push --force to your github clone, so that people seeing your PR have the rebased version
16:37 durham joined #git
16:39 m_antis joined #git
16:41 tgies joined #git
16:41 ceaucari joined #git
16:42 bitkiller joined #git
16:45 dmto joined #git
16:46 orbitphreak joined #git
16:46 tgies joined #git
16:47 jceb joined #git
16:47 jamiejackson fwiw, i don't completely understand rebase. i've read about it but still don't quite know how it fits into my workflow.
16:48 nettoweb joined #git
16:48 nwkj86 joined #git
16:49 Calrik joined #git
16:50 Calrik joined #git
16:50 douglascorrea joined #git
16:51 tgies joined #git
16:52 MattMaker joined #git
16:53 CJKinni joined #git
16:54 hahuang61 joined #git
16:56 tgies joined #git
16:58 bket joined #git
17:01 paul424 joined #git
17:01 gasche left #git
17:02 elastix joined #git
17:03 Eugene jamiejackson - !pull_vs_rebase is a good one
17:03 Eugene !vs
17:03 * Eugene pokes gitinfo
17:03 Eugene !pull_or_rebase
17:03 gitinfo [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel​@lists.sourceforge.net/msg39091.html
17:03 mikecmpbll joined #git
17:04 jamiejackson thx, Eugene
17:04 tomboy64 joined #git
17:04 tomboy64 how can i get the basedir of the current git repo?
17:04 ramsub07 joined #git
17:05 compeman joined #git
17:05 deadnull_ joined #git
17:05 _ikke_ git rev-parse --show-prefix
17:05 milki git rev-parse something
17:05 _ikke_ git rev-parse --show-toplevel
17:05 anberg joined #git
17:05 LeBlaaanc joined #git
17:05 ItSANgo__ joined #git
17:06 tomboy64 show-toplevel - thanks!
17:06 tgies joined #git
17:06 LeBlaaanc joined #git
17:08 JosephFerano joined #git
17:09 Gloomy joined #git
17:09 JosephFerano joined #git
17:09 sbeller joined #git
17:12 tcsc joined #git
17:12 happy-dude joined #git
17:12 armenzg joined #git
17:13 dpower joined #git
17:13 iota_pi joined #git
17:13 bluezone joined #git
17:13 alexsystemf__ joined #git
17:13 jamiejackson so i guess my merge commits are bad form? https://github.com/teamcfad​vance/ValidateThis/pull/94 (fyi, i'm a git noob, and have had a hard time transitioning from svn at work to open-source projects on git)
17:14 ciampix joined #git
17:14 ojacobson it's up to the project
17:14 ojacobson I would tend to use rebase for integrating upstream changes into a feature branch personally, but projects can mandate anything they want
17:14 ojacobson if you believe the fact of the integration is worth recording, then use merge :)
17:15 jamiejackson the project has no guidance regarding contributions, fwiw.
17:15 jamiejackson i take that back, i think this one does.... reading...
17:16 tgies joined #git
17:17 nb-ben joined #git
17:17 wviana_ joined #git
17:18 wviana_ joined #git
17:21 blackpajamas joined #git
17:21 tgies joined #git
17:22 [cust] joined #git
17:22 LeMike joined #git
17:23 felixjet joined #git
17:23 Tortoise joined #git
17:24 jackburton joined #git
17:26 j416 jamiejackson: did you read? https://github.com/teamcfadvance/ValidateThis
17:26 j416 it's very clear :)
17:26 j416 jamiejackson: and, your branch does not follow the guidelines.
17:28 finisherr joined #git
17:28 diogenese joined #git
17:28 sha1sum_ joined #git
17:28 jamiejackson that's what i was referring to in my last post. it's got tangents that i'm still reading through.
17:28 finisherr So, i have a job in travis and I need to also pull down the latest revision of master
17:28 finisherr how can I do this properly
17:28 BSaboia joined #git
17:28 finisherr git fetch origin master?
17:29 preaction git show-ref perhaps? fetch should've already been run by jenkins
17:30 jamiejackson j416: think i should close that pull request and start over?
17:30 weox joined #git
17:30 floatingpoint joined #git
17:31 ojacobson nah. You can always modify a pull request by re-pushing the same branch. Github will deal with that fine, adding any new commits to the PR and removing any missing commits from the PR (eg. if you rebase or rewrite your branch)
17:31 interne7y joined #git
17:31 tgies joined #git
17:31 Oebele joined #git
17:32 jamiejackson ojacobson: so maybe close the pull request, do some fixes, then reopen?
17:32 Pyrogerg Total noob here. I'm trying to add makefiles to the tracked files in a project. In the project's base directory, I entered >git add 'Makefile*'. They're still showing as untracked. In case it matters, they're nested down into subdirectories.
17:32 j416 jamiejackson: as ojacobson says. you can force-push to the PR, probably.
17:33 realz__ joined #git
17:35 rgrinberg joined #git
17:35 CheckDavid joined #git
17:35 hahuang61 joined #git
17:37 nb-ben_ joined #git
17:38 AndreSomers joined #git
17:39 Repox joined #git
17:40 Mowgli joined #git
17:41 tgies joined #git
17:42 lukeshu joined #git
17:43 lukeshu I'm probably having a brain-fart, and just doing something stupid, but:
17:44 lukeshu I'm preplexed at this behavior from `git check-ignore`.  It's outputting files I don't expect it to.
17:44 lukeshu So I tack on the `-v` flag.
17:44 Sasazuka joined #git
17:44 lukeshu And I see things like:
17:45 lukeshu .gitignore:33:!/build-aux/write-i​fchangedbuild-aux/write-ifchanged
17:45 espindola joined #git
17:45 lukeshu It seems wrong to me that a '!' entry should be appearing in the output at all!
17:46 fakenullie lukeshu: this file exists and matches a pattern
17:47 kadoban lukeshu: It's supposed to show everything that matches any pattern at all I would think, not just the ones that ignore stuff.
17:47 arooni joined #git
17:48 fakenullie lukeshu: otherwise it would be impossible to debug exclude patterns
17:48 lukeshu kadoban: That seems... like poor design, but makes sense.  Thank you.
17:49 lukeshu fakenullie: nonsense, that's what the -n flag is for
17:49 jimi_ joined #git
17:49 fakenullie lukeshu: no, -n shows paths that don't match any patterns
17:50 kadoban lukeshu: Not sure why it'd be poor design. What else should it do?
17:50 Shentino joined #git
17:50 kadoban lukeshu: If you're just trying to check if it's ignored or not, you can test the exit status
17:50 kadoban If you're trying to tell yourself, not programatically, just look at the last line.
17:51 fakenullie lukeshu: maybe you need git-ls-files?
17:51 tgies joined #git
17:52 lukeshu kadoban: that doesn't work so well for >1 file
17:52 AaronMT_ joined #git
17:52 lukeshu fakenullie: I know of ls-files; in fact I'm using it to the left of check-ignore in a pipeline
17:52 mohabaks joined #git
17:52 fakenullie lukeshu: why?
17:52 settermjd joined #git
17:53 fakenullie lukeshu: git ls-files -i
17:54 jamiejackson so in the collaboration instructions here (https://github.com/teamcfadvance/ValidateThis), it says to merge your feature branch to *develop*, then push develop to origin, then create a pull request...
17:54 jamiejackson if i've got multiple features going on at once, doesn't merging to my own origin/develop get the different features all jumbled together?
17:55 fakenullie jamiejackson: that looks strange, yeah
17:56 Shentino joined #git
17:56 lukeshu fakenullie: thanks
17:56 fakenullie jamiejackson: feature branch pull request should work
17:56 tgies joined #git
17:56 jamiejackson okay, thanks, fakenullie
17:57 fakenullie jamiejackson: though I don't know about ValidateThis
17:58 jamiejackson yeah, it's just helpful to know that that part about running everything through origin develop is odd, as i'd suspected.
17:58 jamiejackson (when going upstream)
17:59 jumpman i suck at git
17:59 james3015 joined #git
18:00 jamiejackson jumpman: same! is there a club or something?
18:00 jumpman i messed everything up but then i fixed it
18:01 jamiejackson that means you suckED, past tense.
18:02 jumpman sucked, sucks, will suck
18:02 jumpman but at least i'm getting better
18:02 osse how does that one quote
18:02 osse err, err and err again, but always less and less
18:02 osse or something
18:03 kossy_ joined #git
18:03 m0viefreak joined #git
18:03 JosephFerano joined #git
18:04 roxlu joined #git
18:04 jceb joined #git
18:04 Arsonide joined #git
18:05 SwiftMatt joined #git
18:05 dreiss joined #git
18:05 osse "The road to wisdom? Well, it's plain and simple to express: Err and err and err again, but less and less and less."
18:06 tgies joined #git
18:07 GavinMagnus left #git
18:07 _nadim joined #git
18:07 NeverDie joined #git
18:07 dunpeal joined #git
18:07 mikecmpbll joined #git
18:07 texasmynsted joined #git
18:07 dunpeal Hi. What's the most common convention for tagging releases?  release/semver?
18:08 m8 joined #git
18:08 texasmynsted I have some files that are part of a repo that are things that should never have been committed.  They are, and I can not remove them right now.  Every time I make a change in the IDE, these files get "modified".  So I "git stash save "no save"
18:09 texasmynsted Is there something like that, that would be better?
18:10 texasmynsted git reset —hard HEAD, would work I think, but if I made a mistake I would lose changes, staged or otherwise
18:10 texasmynsted Aside from fixing the repo (which is not possible at the moment) how should I better handle this?
18:11 fakenullie texasmynsted: git checkout ?
18:11 fakenullie oh well
18:11 Shentino joined #git
18:11 tgies joined #git
18:11 m_antis joined #git
18:12 ahmedelgabri joined #git
18:12 texasmynsted I do not think that would work.  I would have to checkout each file that changed, right?
18:13 fakenullie texasmynsted: I found something git update-index --assume-unchanged
18:13 |node joined #git
18:14 sdothum joined #git
18:14 fakenullie http://stackoverflow.com/questions/3319479/git-ca​n-i-commit-a-file-and-ignore-the-content-changes
18:15 texasmynsted I will check that out.
18:16 tgies joined #git
18:16 Dyonisos joined #git
18:16 jamiejackson so i figure it's still best practice (and the practice of this project) to forego merge commits. to get this pull request/branch (https://github.com/teamcfad​vance/ValidateThis/pull/94) into better shape for a pull request (assuming that's warranted), would i need to use the `git rebase -i` stuff? (i have never rebased yet, at least not deliberately
18:16 jamiejackson .)
18:18 fakenullie yeah, it could work
18:19 fakenullie or it could not
18:19 fakenullie try it
18:19 Akagi201 joined #git
18:19 texasmynsted well you could branch or save your git repot before you try that.
18:20 fakenullie yeah, make another branch and rebase -i it
18:20 nilg joined #git
18:21 texasmynsted If all goes well you likely will not want the un-rebased branch any more
18:21 texasmynsted you could move it
18:21 mda1 joined #git
18:21 tgies joined #git
18:22 texasmynsted git branch -m oldname old/oldname
18:22 Psychiatrist joined #git
18:23 nadim joined #git
18:23 fakenullie you may want to just cherry-pick relevant commits onto tip of upstream branch
18:23 Sendoushi joined #git
18:27 _nadim joined #git
18:27 t0by joined #git
18:27 nilg joined #git
18:27 circ-user-smZVh joined #git
18:27 sdothum joined #git
18:29 circ-user-smZVh how do I transport n last commits on top of another branch? Some commit(s), closest to the common root will be lost intentionally.
18:29 nadim joined #git
18:31 Infamous joined #git
18:31 diegoaguilar joined #git
18:32 interne7y joined #git
18:32 lmat I merged two branches recently, then I made another commit. I would like to squash my last commit with the merge.
18:32 lmat How do I do that?
18:32 Infamous joined #git
18:32 lmat (In other words, I want to improve the merge commit :-)
18:32 jchonig joined #git
18:32 TomyLobo hmmm
18:33 Infamous hm
18:33 TomyLobo "git branch backup" to be safe
18:33 TomyLobo then git reset HEAD~1
18:33 lmat tomog999_: done that ^_^
18:33 TomyLobo and git commit -a --amend
18:33 multi_io joined #git
18:33 TomyLobo if you added new files, "git add" them first
18:33 lmat oops, I meant TomyLobo: done that   (@git branch)
18:33 Infamous i am commiting on osx to a project i do nothing different than i would do on linux but the only thing i see displayed as addition is +Subproject commit and some hash
18:33 lmat I'll give it a go.
18:33 Infamous why is it doing that :(?
18:34 TomyLobo is it ok to ask about git-lfs here?
18:35 fakenullie TomyLobo, lmat git reset --soft
18:35 TomyLobo yes, better idea
18:35 _nadim joined #git
18:36 Panacea joined #git
18:36 tgies joined #git
18:36 lmat TomyLobo: yo!
18:37 lmat --soft or not, whatever :-) it worked great.
18:38 k3rn31 joined #git
18:38 mikecmpbll joined #git
18:40 L8D joined #git
18:41 fuchstronaut joined #git
18:41 BSaboia how can I clean all the local branches that do not have a corresponding remote?
18:41 tgies joined #git
18:41 dhollinger joined #git
18:44 jamiejackson okay, thanks texasmynsted and fakenullie
18:44 nadim joined #git
18:45 nurey_ joined #git
18:45 mwhooker joined #git
18:46 tgies joined #git
18:48 _nadim joined #git
18:50 elsevero joined #git
18:51 sgen joined #git
18:51 _ikke_ BSaboia: There is no easy command in git to do that
18:52 tgies joined #git
18:52 BSaboia _ikke_, git pull --all --prune does not takes care of this, as it seems...
18:52 espindola joined #git
18:52 _ikke_ No, that's to remove remote tracking branches that do not exist on the remote repository anymore
18:53 jstimm_ joined #git
18:55 ramsub07 hello, for git cherry pick command, how do i get the hash of the commit ?
18:55 cbreak ramsub07: git log, git rev-list, or any other method you want
18:55 Psych joined #git
18:55 cbreak ramsub07: you don't have to use the hash, you can use an other symbolic name too
18:56 ramsub07 cbreak: as in ?
18:56 cbreak develop, v1.7-release, origin/master
18:56 cbreak what ever
18:56 _ikke_ HEAD~10
18:56 cbreak branches, tags, relative notation, ...
18:56 _ikke_ man gitrevisions
18:56 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
18:57 tgies joined #git
18:57 cbreak ramsub07: man gitrevision should have details
18:57 ramsub07 cbreak: i see commit:<some 40 characters> on github
18:57 cbreak sure
18:57 ramsub07 is that 40 character word the commit hash ?
18:57 rgrinberg joined #git
18:59 codedmart left #git
18:59 _ikke_ yes
19:00 paul424 joined #git
19:02 osse no, it's an ascii representation of it!!!!!1111
19:02 osse or hex representation i guess
19:02 _ikke_ For all intents and purposes..
19:04 clemf joined #git
19:05 nebodka joined #git
19:05 robotroll joined #git
19:06 ramsub07 hello i have branched out from master into a branch B. I have another branch( branch A ) in which i have made few commits. I need all those commits over the branch A to be applied over branch B. How do I go about ?
19:06 tgies joined #git
19:06 nebodka joined #git
19:07 _ikke_ rebase can do that
19:08 ramsub07 _ikke_: can't i do with cherry pick ?
19:09 SwiftMatt joined #git
19:09 cbreak sure you can
19:09 cbreak if you like manual labor :)
19:09 _ikke_ rebase and cherry-pick are very much alike
19:10 nadim joined #git
19:10 _ikke_ The very basic difference is that cherry-pick just copies, while rebase moves
19:11 dopesong joined #git
19:11 tgies joined #git
19:12 mbrzuzy joined #git
19:12 SteenJobs joined #git
19:12 ramsub07 cbreak: i want to copy few commits, i have the commit hash of those commits. Do i need to manually apply them ?
19:13 ramsub07 cbreak: if i happen to cherry-pick ?
19:13 SteenJobs hey guys - would anyone be able to help me diagnose why writing objects is consistently super slow when pushing?
19:13 nebodka joined #git
19:13 dunpeal Hi. What's the most common convention for tagging releases?  release/semver?
19:13 nebodka left #git
19:14 _ikke_ vx.y.z
19:14 ramsub07 cbreak: in other words, if i want to copy multiple commits from one branch to the other, using cherry pick how do i go about ?
19:16 SteenJobs only 3913 objects, decently fast internet connection, yet going insanely slow. like Lincoln Tunnel traffic slow.
19:16 clemf joined #git
19:16 mehola joined #git
19:16 nadim joined #git
19:16 tgies joined #git
19:18 _nadim joined #git
19:19 fission6 joined #git
19:19 infra-red joined #git
19:19 hahuang61 joined #git
19:19 aard_ joined #git
19:20 clemf joined #git
19:22 tgies joined #git
19:23 Ph_ joined #git
19:24 nadim joined #git
19:24 Emanuel_ joined #git
19:24 knutstrut joined #git
19:25 Emanuel_ Hello
19:25 gitinfo Emanuel_: 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.
19:26 Emanuel_ Is there anyone here?
19:27 tgies joined #git
19:27 _ikke_ no
19:27 Emanuel_ xD
19:27 * _ikke_ hides
19:27 osse I left a couple of minutes ago
19:28 dunpeal left #git
19:28 Emanuel_ I need some help with a simple command using archive
19:29 knutstrut joined #git
19:29 nettoweb joined #git
19:30 knutstrut joined #git
19:30 knutstrut joined #git
19:30 mikecmpbll joined #git
19:30 cdown joined #git
19:31 SteenJobs mikecmpbll: howdy haha
19:31 mikecmpbll howdy!
19:32 nadim joined #git
19:32 Emanuel_ hi!
19:32 tgies joined #git
19:32 settermjd joined #git
19:32 sandcurves joined #git
19:32 grift joined #git
19:33 interne7y joined #git
19:33 SteenJobs is there any reason why a really big previous commit would have any affect on writing objects in my current push?
19:33 SteenJobs there’s without a doubt something wrong happening, i made really really minor changes, yet writing objects keeps getting stuck
19:33 SteenJobs slash running super slowly
19:34 fstd joined #git
19:34 star_prone joined #git
19:35 jaguarmagenta joined #git
19:35 SteenJobs “Writing objects:  34% (388/1114), 20.89 MiB | 133.00 KiB/s”
19:36 preaction it's writing 20MiB of files at 130KB/s. what's the server's i/o stats look like?
19:36 T4nk5bb0t Could it be your connection to the internet? Could it be the connection of the server to the internet? Could there be a problem with your local connection if the server is internal?
19:36 nnyk_ joined #git
19:36 nadim joined #git
19:37 knutstrut joined #git
19:38 SteenJobs preaction, T4nk5bb0t: i made tiny changes. like really minor.  internet connection is quite fast.
19:38 SteenJobs preaction: when i try running verbose, nothing changes in the output
19:38 nadim joined #git
19:38 zincrokx joined #git
19:38 preaction okay, but that doesn't answer my question of what the server's i/o stats look like
19:39 preaction and if there's 20MiB of stuff to push, maybe not everything made it up last time?
19:39 Macaveli joined #git
19:40 SteenJobs preaction: maybe - how do i check the server’s i/o stats? i figured with verbose…also it does happen to be that my last commit was very large, because i was pushing my ‘Pods’ directory with all of the installed frameworks. could it be that it simply didn’t finish pushing?
19:40 SteenJobs nah it must have
19:41 SteenJobs because someone else pulled my changes annd they have all of the frameworks…there were no errors on their end
19:41 preaction why must it have?
19:41 _ikke_ Emanuel_: It helps to actually ask a question
19:41 Emanuel_ yes, sorry
19:41 SteenJobs preaction: if all the changes weren’t pushed, he wouldn’t have been able to run the app with my changes
19:41 preaction SteenJobs: iostat is one command one can run on a server to determine what it's doing with io
19:41 tgies joined #git
19:41 knutstrut joined #git
19:42 SteenJobs preaction: i’m hosting on bitbucket
19:42 preaction then ask bitbucket support perhaps?
19:42 Pyrogerg I want to undo a bunch of changes I made to a project. Specifically, I want the state of the project to be what it was two commits ago.  I think reset is the command I need, but I'm not sure. Help?
19:42 SteenJobs their status is all green and pretty
19:42 SteenJobs i’m inclined to believe that would be waste of time since i doubt it’s on their end
19:42 preaction then if it's not them, and it's not you, then it's fast
19:43 ril joined #git
19:43 preaction but i'm inclined to believe git, and git says it needs to upload 20MiB of stuff, and can only do so at 133KiB/s
19:43 preaction Pyrogerg: yes. reset is the command to use
19:43 preaction Pyrogerg: if you're unsure, make a !backup
19:43 gitinfo Pyrogerg: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
19:43 Pyrogerg Okay. I'm looking at the documentation for reset now.
19:43 L8D joined #git
19:43 Emanuel_ I've done two commits and I need to archive this last two commits changes, I've been doing this with "git archive HEAD $(git diff --name-only --diff-filter=ACMRT HEAD^)" but this works only with the latest commit
19:44 Emanuel_ "git archive HEAD $(git diff --name-only --diff-filter=ACMRT HEAD^2)" doesn't seems to work
19:44 Synthead joined #git
19:44 _ikke_ What about it does not work?
19:44 fuchstronaut joined #git
19:44 Gitzilla joined #git
19:45 _nadim joined #git
19:45 SteenJobs preaction: well 20MiB at 34%, so greater than 20% really. although i don’t understand how it could’ve been incomplete if the other guy was able to pull my changes?  Also…when i stop the push and restart it, it jumps straight to 34% (which was where it was at when i stopped it) - just want to make sure that’s normal behavior
19:45 franl joined #git
19:45 SteenJobs weird. and it only says 10MiB
19:45 evil-t0by joined #git
19:45 SteenJobs last time 34% was already at like 30MiB
19:46 rgrinberg joined #git
19:46 vigilvindex joined #git
19:46 liquidjamm joined #git
19:46 ril joined #git
19:46 tgies joined #git
19:47 santa-fire joined #git
19:47 clemf joined #git
19:47 Balliad joined #git
19:47 SteenJobs preaction: could having two separate push remotes cause any issues?
19:47 Pyrogerg So I can get my project to where it was two commits ago with $ git reset --hard HEAD~2. Is this correct?
19:48 _ikke_ Yes, that will move the current branch two commits back, and updates the local files to that commit
19:49 Emanuel_ I'm using "git archive HEAD $(git diff --name-only --diff-filter=ACMRT HEAD^) | gzip > patch.tgz" to generate a file with latest comming changes, I need to get a file with changed on HEAD^2 + HEAD^1
19:49 grift joined #git
19:49 Emanuel_ comming* mean commits
19:50 _ikke_ Emanuel_: HEAD~2, not HEAD^2
19:50 _ikke_ HEAD^2 means the second parent of HEAD
19:50 _ikke_ which only makes sense for merge commits
19:51 osse Emanuel_: wouldn't it be better to store the patches?
19:51 synthroid joined #git
19:51 tgies joined #git
19:52 Emanuel_ so HEAD^ should be HEAD~ ?
19:52 Emanuel_ @osse what do you mean?
19:53 osse Emanuel_: you want to generate an archive of what exactly?
19:53 cdg joined #git
19:53 osse the changes? the changed files?
19:53 _ikke_ Emanuel_: HEAD^ and HEAD~ are the same in that case
19:53 cdg joined #git
19:53 _ikke_ but HEAD~2 and HEAD^2 are not the same
19:53 evil-t0by joined #git
19:54 evil-t0by joined #git
19:55 Emanuel_ @osse I need to generate a archive with only the files that changed from the last two commits
19:55 t0by joined #git
19:55 frem_ joined #git
19:57 tgies joined #git
19:57 osse git diff -z --name-only --diff-filter=ACMRT HEAD~2 HEAD | xargs tar -czf patch.tgz
19:57 mohabaks joined #git
19:57 Emanuel_ imagine I've commited a new file "newfile" and then commites another new file "newfilenew", I need to archive with "newfile" and "newfilenew"
19:57 leehambley joined #git
19:57 knutstrut joined #git
19:58 _ikke_ osse: That will only store the diffs, not the complete file contents
19:58 inflames joined #git
19:58 _ikke_ oh, n/m me
19:58 osse _ikke_: REKT
19:59 diegoaguilar joined #git
19:59 choki joined #git
19:59 _ikke_ What if a file has been deleted
20:00 osse the diff filter would have excluded it
20:00 Emanuel_ then that file shouldn't be included
20:00 blackwind_123 joined #git
20:00 diegoaguilar joined #git
20:00 felixjet can someone give me a hand please?
20:01 felixjet i did a rebase of the last two commits
20:01 felixjet pick last and squash the older
20:01 felixjet i specified a commit message, and i think all is fine
20:01 felixjet but if i push i'm getting Updates were rejected because the tip of your current branch is behind its remote counterpart.
20:01 _ikke_ !rewrite
20:01 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
20:02 felixjet so what should i do?
20:02 _ikke_ Does anyone else use this repository?
20:02 felixjet i submitted a pull request to github which now contains 2 commits and probably i'm going to get asked to rebase it
20:02 _ikke_ ah o
20:02 felixjet this repository no, it's a fork
20:02 _ikke_ So it's for a pull request?
20:02 felixjet yes
20:03 _ikke_ push -f then
20:03 felixjet in the pull request now appears as 2 commits
20:03 felixjet if i force it, the pull request will appear as 1 commit?
20:03 Emanuel_ _ikke_: "git archive HEAD $(git diff --name-only --diff-filter=ACMRT HEAD~2) | gzip > patch.tgz" did work! thanks you!
20:03 Emanuel_ osse: thanks you too!
20:04 _ikke_ Emanuel_: git archive can create compressed archives too
20:04 _ikke_ git archive --format=tar.gz
20:04 rom1504 felixjet: yes
20:05 felixjet thanks!
20:09 jasom joined #git
20:09 msafi joined #git
20:09 martixy joined #git
20:09 msafi Can I squash my commits without 'rebase'?
20:09 jasom is there a way to get a behavior like autocrlf on just a single directory, or should I instead use unix2dos/dos2unix as a smudge/clean filter?
20:09 msafi When I rebase, I get merge conflicts that I've already resolved before
20:10 benwbooth joined #git
20:11 martixy Hello. I have a question: Let's say I have 2 environments(e.g. master and dev). How can I keep 2 separate configs for both while merging from one to the other?
20:11 romerocesar joined #git
20:11 preaction keep them both in the repo and pick which one to use with a command-line variable or environment variable
20:11 tgies joined #git
20:12 ramsub08 joined #git
20:12 Ranhir joined #git
20:13 Emanuel_ _ikke_ that archive option is not working for me in windows
20:13 JJM joined #git
20:13 ojacobson msafi: try 'git rebase -i --onto @{upstream}...HEAD'
20:13 ojacobson which will give you the rebase UI, but will replay your commits onto the same base commit between HEAD and its upstream
20:13 martixy And is it possible to not rely on setting up the environment to setup the environment?
20:13 ojacobson that way you can edit the branch without also integrating upstream changes
20:14 osse jasom: use one or more .gitattributes files
20:14 tristanp joined #git
20:14 SwiftMatt joined #git
20:14 osse msafi: no, but it helps to rebase onto an ancestor
20:14 martixy It makes it somewhat self-defeating.
20:15 msafi ojacobson: actually, the branch includes commits that resolved conflicts with upstream changes
20:15 msafi ojacobson: is that an issue? ^
20:15 osse msafi: e.g. if you're on feature you can do 'git rebase -i HEAD~5' instead of 'git rebase master'
20:15 jasom osse: oh, I see, I missed the text attribute first time I looked
20:15 jasom msafi: if you enable rerere before you do the first merge, it can automatically resolve the conflicts at squash time
20:16 grift joined #git
20:17 tgies joined #git
20:18 msafi osse: yes, I tried something like `git rebase -i HEAD~5` but it still didn't work and I assume it didn't work because my branch merges upstream into itself and solves conflicts there
20:18 rahtgaz joined #git
20:19 osse msafi: in that case yer fucked
20:19 msafi osse: what's the next best thing to try?
20:19 osse there is no next best
20:19 msafi osse: if my goal is to make my PR have one commit
20:20 osse just one? then you can squash everything
20:20 nitin joined #git
20:21 yqt joined #git
20:21 msafi That doesn't seem to be working for me, when I squash I get merge conflicts
20:21 osse what exactly are you doing?
20:21 osse egg-sack-ly
20:22 tgies joined #git
20:22 msafi Squash all commits in my feature branch to one so that I don't pollute the master branch
20:22 osse and you don't reorder?
20:23 msafi The conflicts I get don't make sense because before squashing my branch didn't have conflicts with master. Only when I try to squash I get those conflicts.
20:23 msafi osse: reorder?
20:23 osse just tell me the exact commands you try to run
20:24 msafi So, `git rebase -i HEAD~2`
20:25 msafi I get the UI, it includes two commits. One of them is the commit where I merged upstream master to my branch and resolved conflicts
20:25 msafi I want to squash these two into one.
20:25 EvilPenguin joined #git
20:26 osse aha, mhm, and what do you do next ?
20:26 msafi I select "squash" on the merge conflict commit and "pick" on the other commit. The "other commit" being parent of the merge commit
20:26 nurey joined #git
20:27 tgies joined #git
20:27 osse in other words: pick on the comit at the top and squash on the commit after it, on the second line
20:27 osse right?
20:28 msafi No, the other way actually...you're right, I'm confused. I thought the top was parent of the bottom
20:28 msafi So, the bottom is parent of the top?
20:28 dreiss joined #git
20:28 msafi https://i.imgur.com/cGy1iRt.png
20:29 msafi ok?
20:29 osse top is parent of bottom
20:29 osse the newest commit is at the bottom
20:29 osse so the bottom commit should have squash next to it
20:29 osse the top commit should remain a pick
20:30 msafi Okay, I did that
20:30 fuchstronaut joined #git
20:30 msafi Then `:wq` and that's what I got: https://i.imgur.com/q4ePniX.png
20:30 osse also, y u no have nice colors in vim. echo syntax on >> ~/.vimrc  man, jeez
20:30 m1dnight_ joined #git
20:31 msafi osse: I don't really use Vim for anything else
20:31 osse is 'Alerts component' a merge commit ?
20:31 msafi osse: yes
20:32 nurey left #git
20:32 tgies joined #git
20:32 osse so you want to create an evil merge. Boo!
20:32 ki0 joined #git
20:32 osse in any event: git reset --soft HEAD~; git commit --amend
20:33 osse so you're one commit will be a merge? what is it merging then? :S
20:33 interne7y joined #git
20:34 msafi I don't get it?
20:34 msafi Your last question
20:35 osse "Squash all commits in my feature branch to one so that I don't pollute the master branch"
20:35 osse end result from this: the only commit on your feature branch is a merge commit
20:35 msafi Yeah, I don't know
20:36 osse Don't worry, I don't either
20:36 msafi It should be possible
20:36 osse it kinda is, but then my question is: what is it merging?
20:36 msafi Everything on my branch
20:36 msafi To the master branch
20:36 msafi That's what I want
20:37 tgies joined #git
20:37 osse do 'git log --graph --oneline --decorate yourbranch master'
20:37 CalimeroTeknik joined #git
20:37 osse and show it to me if you can
20:38 radsy joined #git
20:38 msafi https://i.imgur.com/6Gaeve2.png
20:39 msafi (I actually use SourceTree day to day)
20:39 ojdo joined #git
20:40 msafi osse: master is actually `upstream-develop`
20:41 boombatower joined #git
20:41 AaronMT joined #git
20:41 osse msafi: I see three commits named WIP
20:41 osse I suppose all of those are yours
20:41 msafi osse: yes
20:41 osse don't you want to squash those? :p
20:42 msafi osse: I do, but I was talking about 2 commits earlier just to show the problem
20:42 tgies joined #git
20:42 osse the problem is that the "topology" of it all is more complex than i though
20:42 osse you don't want to squash into Alerts component. That's not your commit to begin with
20:43 ojacobson if your work tree & index are clean and you're on saved-for-later, 'git reset --soft upstream/develop && git commit' should do the thing you want
20:43 ojacobson which is create a single commit, based on upstream/develop, with your current tree
20:43 ojacobson (and make that the tip of the saved-for-later branch)
20:43 osse listen to the oregonian
20:43 ojacobson who
20:43 osse hmmm
20:43 * osse greps the logs
20:44 ojacobson torontonian :)
20:44 tjbp joined #git
20:44 osse i'm thinking off offby1
20:46 msafi ojacobson: so if I soft reset toe upstream-develop, then commit the changes, how would git know that the conflicts I'm committing now have been resolved already?
20:46 osse msafi: you subvert the whole problems
20:46 osse msafi: there is no conflict to resolve. the current code is taken as gospel
20:46 osse whatever differences there are between your current code and upstream-develop becomes the diff
20:46 ojacobson conflicts are a merge outcome
20:46 ojacobson there's no merge involved in this approach
20:47 msafi Sounds dangerous
20:47 tgies joined #git
20:47 ojacobson git is internally snapshot based, purely, so the command sequence I gave takes the staged tree and re-commits it
20:47 ojacobson using git-reset to control what the parents of the resulting commit will be
20:48 osse msafi: you can create a new branch and try it oout
20:48 osse do git checkout -b tmp then do what the torontonian suggested
20:49 msafi osse: branch out of `saved-for-later`?
20:49 msafi (my feature branch)
20:49 osse yes
20:50 msafi Ok, really appreciate the help. Thanks a lot!
20:51 BSaboia joined #git
20:51 MrWoohoo joined #git
20:51 texasmynsted are there any draw-backs to using git update-index —assume-unchanged to get git to ignore some files that should never have been added to the repo?
20:51 texasmynsted Like this http://archive.robwilkerson.org/2010/03/02​/git-tip-ignore-changes-to-tracked-files/
20:52 milki texasmynsted: why dont use youse gitignore?
20:53 milki texasmynsted: assume unchanges usually results in unintended behaviour that the user doesnt expect
20:53 texasmynsted because 1. the files are already committed to the repo 2. gitignore is committed to the repo 3. I can not remove these files from the repo nor commit a change to gitignore to ignore them.
20:54 texasmynsted It is not a technical reason why I can not remove them.  It is that the repo owner does not want them removed.
20:56 ojacobson texasmynsted: that's not what assume-unchanged does, primarily
20:56 ojacobson assume-unchanged tells git "I will not change these files, never check if they're modified before overwriting them"
20:56 tjbp joined #git
20:56 ojacobson it's meant as a performance hack for people work on small areas of a large repo, not as a local ignore, and has dangerous semantics when treated as a local ignore.
20:56 tgies joined #git
20:57 acetakwas joined #git
20:57 WaReZ joined #git
20:57 anberg joined #git
20:58 milki also, its local to the repo
20:59 nnyk_ joined #git
20:59 johnmilton joined #git
20:59 cdown joined #git
21:00 texasmynsted so the drawback it they "will" be overwritten when the repo version get overwritten
21:01 texasmynsted I just see no other way beyond 'git stash save "no save"' every time before I change branches or really do much
21:02 ojacobson they will get overwritten at any time git thinks it should rewrite those files in the work tree
21:03 ojacobson personally, i'd put together a proposal for the upstream project outlining why this is a problem and proposing a solution (such as a config.default file, which is tracked, and a config.local file, which is not)
21:04 texasmynsted Oh I suppose not only would they get overwritten but I would not know they are overwritten.
21:04 ojacobson yes; it happens silently, since the files aren't supposed to contain changes
21:04 texasmynsted hmm
21:05 texasmynsted Then I guess I am back with stash
21:05 texasmynsted sigh
21:05 ojacobson this comes up often enough that I'm tempted to write a wrapper for git-add
21:06 bruce_lee joined #git
21:06 bruce_lee joined #git
21:07 tgies joined #git
21:07 shades joined #git
21:08 jokajak joined #git
21:08 jokajak joined #git
21:12 tgies joined #git
21:13 dreiss joined #git
21:15 nnyk_ joined #git
21:15 eijk_ joined #git
21:15 mwhooker joined #git
21:17 tgies joined #git
21:18 crayon joined #git
21:19 fstd joined #git
21:21 jeffreylevesque joined #git
21:22 phanimahesh joined #git
21:27 tgies joined #git
21:27 d4rklit3 joined #git
21:27 GT joined #git
21:27 L8D joined #git
21:28 nwkj86 joined #git
21:32 tgies joined #git
21:33 Matsv joined #git
21:33 madewokherd joined #git
21:33 _nwkj86 joined #git
21:34 fscala joined #git
21:34 interne7y joined #git
21:36 jaguarmagenta joined #git
21:37 tgies joined #git
21:37 cdg joined #git
21:39 mda1 joined #git
21:40 EvilPenguin joined #git
21:41 codeliger joined #git
21:42 tgies joined #git
21:44 BSaboia why some guidelines prefer rebasing over merging?
21:44 BSaboia https://wiki.diasporafoundation.org/Git_workflow
21:47 zincrokx joined #git
21:48 SteenJobs BSaboia: hold on two seconds, i have an amazing blog post for you
21:48 SteenJobs unless that wasn’t a question
21:48 BSaboia it is a question
21:48 BSaboia I use merge
21:48 SteenJobs BSaboia: https://medium.com/@porteneuve/getting-s​olid-at-git-rebase-vs-merge-4fa1a48c53aa#.4ym7v5nxd
21:48 BSaboia so I am curious
21:48 SteenJobs fundamentally changed my understanding of collaborating when using git
21:49 SteenJobs and clarified rebase vs. merge
21:49 BSaboia thanks
21:49 skapunker joined #git
21:49 SteenJobs you know how once in a while a single blog post/article alone just totally teaches you what you’ve been looking all over for? i found this to be one of those
21:49 astrofog joined #git
21:51 SteenJobs hey guys - if i have a branch B which is a descendant of master, but there is a branch A in between master and branch B, is there a way to rebase branch B so that it’s a direct descendant of master (rather than a ?grandchild?)?
21:51 nwkj86 joined #git
21:52 Dougie187 left #git
21:52 tgies joined #git
21:53 SteenJobs so instead of master —> branch A —> branch B, i need master —> branch A, and master —> branch B
21:54 phanimahesh joined #git
21:54 Lynxium[] joined #git
21:55 milki SteenJobs: sure, when you rebase B, delete A
21:55 SteenJobs milki: well i tried simply doing git rebase master, and it’s telling me current branch B is up to date
21:55 milki SteenJobs: use --interactive
21:55 SteenJobs milki: and i still need branch A…just need them both to come from master
21:55 milki SteenJobs: you arent changing A, only B
21:55 SteenJobs ooo nice - why does not using the interactive tag not work?
21:56 milki SteenJobs: because it only replays commits.
21:56 milki SteenJobs: you want to replace B and remove A
21:56 SteenJobs milki: oh by remove A you mean remove A from B’s history
21:57 milki yeah
21:57 SteenJobs makes complete sense :)
21:57 tgies joined #git
21:57 SteenJobs milki: so interactive rebase and just remove all commits that are part of branch A?
21:58 phanimahesh joined #git
21:58 durham joined #git
21:58 milki yeah
21:58 milki hm
21:58 milki yeah
21:59 SteenJobs milki: fingers crossed that removing those commits don’t remove them from branch A…will let you know! ha
21:59 milki as long as still have branch A, itll be fine
22:00 BSaboia how can I remove all the local branches that are not present in remote?
22:00 SteenJobs gotta do it manually from what i understand…or some fancy git commands that are above my pay grade but possibly on par with milki’s pay grade
22:01 phanimahesh Don't automate branch removals. The extra minute spent is always worth it
22:01 durga317a joined #git
22:02 tgies joined #git
22:02 SteenJobs milki: boom. thanks brother/sister
22:03 cdown joined #git
22:05 mischat joined #git
22:05 cd83x joined #git
22:06 b_jonas Is there a way I can see the full manual pages of git online with a web browser, always for a recent version of git (more fresh than what I have installed)? I'm trying to look at https://git-scm.com/docs/git but that seems to be missing some generated part of the git(1) manpage where it lists commands.
22:06 L8D joined #git
22:07 Jellyg00se joined #git
22:07 tgies joined #git
22:12 tgies joined #git
22:12 denimsoft joined #git
22:12 rnsanchez_ joined #git
22:13 mwhooker_ joined #git
22:17 milki b_jonas: man git has a lot of them
22:17 gitinfo b_jonas: the git manpage is available at http://jk.gs/git.html
22:17 b_jonas milki: yes, but I'm asking for a version later than what I have installed, viewable online
22:18 b_jonas gitinfo: that ddoesn't seem to be a very recent version either. it says "Last updated 2015-10-05 13:38:43 PDT"
22:18 _rht joined #git
22:19 EvilPeng1 joined #git
22:20 Pyrogerg I have a question about standard practice for commit messages. For some commits, ones that represent milestones, there is an obvious message about what was changed. However I also like making frequent incremental commits for which there is not an obvious message. I've just made a few incremental changes and nothing broke. It seems that a message like "Incremental <timestamp>" would make sense. Is there an easy way to do that without manually typing in a
22:20 Pyrogerg timestamp? Or is there some other standard practice that I should know about?
22:20 milki Pyrogerg: you can add a pre-commitmsg hook to templatize your commits
22:21 osse Pyrogerg: for "useless" checkpoint commits you might want to use commit --amend
22:21 milki Pyrogerg: or use an existing commit as a template with -C
22:22 tgies joined #git
22:22 Pyrogerg Good ideas. I am getting in the habit of using commit --amend. I'll look for more info on templatizing commits.
22:23 osse Pyrogerg: commit --amend makes sense if all your small incremental commits add up to something worthwhile
22:23 osse Pyrogerg: there are lots of workflows. using commit --fixup or --squash for example
22:24 osse nice if your small incremental commits add up more than one worthwhile thing
22:24 Pyrogerg Thanks
22:25 osse Pyrogerg: lots of ideas here !sausage
22:25 gitinfo Pyrogerg: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.c​om/GitBestPractices/#sausage and !perfect
22:26 ochorocho__ joined #git
22:26 Pyrogerg Thanks, @osse. That's exactly the sort of thing I'm wanting to read right now.
22:26 Pyrogerg Hmm, guess I didn't need that at sign.
22:26 osse !perfect
22:26 gitinfo [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
22:27 osse Pyrogerg: it's not usual to use @ on IRC, but I don't care
22:27 tgies joined #git
22:29 fuchstronaut joined #git
22:32 ril joined #git
22:32 tgies joined #git
22:32 johnmilton joined #git
22:33 EvilPenguin joined #git
22:34 invisbl joined #git
22:35 interne7y joined #git
22:35 aidalgol joined #git
22:37 SteenJobs joined #git
22:37 tgies joined #git
22:40 Juzzika joined #git
22:42 ToBeCloud joined #git
22:43 ToBeCloud joined #git
22:43 raijin joined #git
22:43 ToBeCloud joined #git
22:44 ToBeCloud joined #git
22:44 ToBeCloud joined #git
22:44 ToBeCloud joined #git
22:44 dodobrain joined #git
22:45 ToBeCloud joined #git
22:45 ToBeCloud joined #git
22:45 Blacklite joined #git
22:45 gsingh joined #git
22:45 ToBeCloud joined #git
22:47 tgies joined #git
22:49 TheMoonMaster joined #git
22:50 espindola joined #git
22:50 scoobertron joined #git
22:52 tgies joined #git
22:53 sangy joined #git
22:53 var_x joined #git
22:54 Trieste left #git
22:57 _nwkj86 joined #git
22:58 tgies joined #git
23:01 d0nn1e joined #git
23:03 tgies joined #git
23:04 var_x hey guys i was just handed some 6 year old offshored code on a CD to refactor/add features to (yay me!). I noticed it had a .svn folder hanging around so I did an 'svn info' and got the repo url, but it's no longer there  of course. Is there any way I can build a git history from an svn repo with just the local .svn folder and not the remote server?
23:04 preaction from what i understand, svn stores its history on the remote server, so no
23:05 thiago joined #git
23:05 ojacobson as preaction says.
23:05 ojacobson the .svn info contains a clean copy of the current version, and pointers to the repo
23:05 ojacobson (and some other info, but those are the only history-relevant bits)
23:05 m0dest joined #git
23:05 var_x bah, darn it. Guess I got to do this the hard way
23:05 var_x Thanks
23:05 ojacobson `git init && git add --all` :)
23:06 _0xbadc0de joined #git
23:06 cdown joined #git
23:07 tyoc213 joined #git
23:08 var_x ya, was just hoping a history could give me an insight into their design. There's no documentation of course. At least there's comment headers I guess.  This is why I love git. I've been handed code from git on a thumb drive from a client, and sure enough, I had the whole history right there.
23:08 Topic for #git is now Welcome to #git, the place for git help and Thor's Day | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Asgardian! You are called to serve in the https://madeitwor.se/git-jokes crusade! Submit a PR or face the Hammer!
23:08 franl joined #git
23:08 tyoc213 Hi there, Im having problems cloning in windows... if I use git clone ssh://git@host:sub_folder/repo.git it says that it could not resolve the site host:sub_folder
23:09 preaction if you're doing ssh://, it should be a /, not a :, to separate the host from the path
23:09 Eugene was kicked by Eugene: Back to work
23:09 preaction so, ssh://git@host/folder/repo.git
23:09 Eugene joined #git
23:11 |2701 joined #git
23:17 tgies joined #git
23:17 _nadim joined #git
23:17 IWishIKnew joined #git
23:19 tyoc213 preaction: well doing ssh without ":" how I enter my username? I mean my user name is a full email AFAIK
23:20 tyoc213 (trying different options that come to mind now)
23:20 ffabi joined #git
23:20 fstd_ joined #git
23:21 mmlb joined #git
23:22 rgrinberg joined #git
23:22 tgies joined #git
23:24 jstimm_ joined #git
23:24 _rnsanchez_ joined #git
23:24 safe joined #git
23:25 preaction tyoc213: you url-encode the @ symbol, or you just leave it off and type it in when prompted. or you add it to your ssh config
23:25 tyoc213 I see, OK, will try
23:25 tyoc213 thx
23:25 preaction so, ssh://me%40example.com@host/path/repo.git
23:26 mablae_ joined #git
23:27 tgies joined #git
23:28 eletuchy joined #git
23:28 am55 joined #git
23:29 benwbooth joined #git
23:32 Helox joined #git
23:33 nighttime joined #git
23:35 Samual joined #git
23:36 SwiftMatt joined #git
23:36 interne7y joined #git
23:36 tax joined #git
23:36 dreiss joined #git
23:38 _0xbadc0de hi
23:38 tgies joined #git
23:38 _0xbadc0de I messed up with my local git repo
23:38 _0xbadc0de e messed up the files on .git
23:38 _0xbadc0de yes I am a very bad boy and deserve to go to hell
23:38 _0xbadc0de moving on
23:38 _0xbadc0de I just want to be able to get the latest master version
23:38 _0xbadc0de and develop from there
23:39 _0xbadc0de how can I do this? git pull simply doesn't work
23:39 BSaboia _0xbadc0de, could you clone again?
23:39 star_prone joined #git
23:39 _0xbadc0de idk how do I do that?
23:40 ojacobson it is never necessary to re-clone, but for beginners it can be an easy way to get a predictable result…
23:40 bremner well. if you trash .git, it's reclone or restore from backups
23:40 _0xbadc0de how do I do that
23:40 _0xbadc0de reclone?
23:40 ojacobson 'git clone <url> <some directory>'
23:42 GavinMagnus joined #git
23:43 tgies joined #git
23:43 mattfoo joined #git
23:44 clemf joined #git
23:44 ash_workz joined #git
23:46 prsn joined #git
23:46 Lyqyd joined #git
23:48 tgies joined #git
23:48 Xomnom joined #git
23:48 jimi_ joined #git
23:48 ceaucari joined #git
23:48 jimi_sanchez joined #git
23:49 Xomnom Is there a way to merge with my staging area without committing those changes first?
23:50 kadoban Kinda with stashes, but … just commit instead.
23:51 eletuchy joined #git
23:54 dmto joined #git
23:55 scoobertron joined #git
23:55 mda1 joined #git
23:57 tgies joined #git
23:58 GavinMagnus left #git

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