Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-27

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

All times shown according to UTC.

Time Nick Message
00:01 ahmed_elgabri joined #git
00:04 Mixologic joined #git
00:08 falkenb0t joined #git
00:09 falkenb0t yo
00:09 falkenb0t left #git
00:09 falkenb0t joined #git
00:12 AnarchyAo joined #git
00:12 Eugene Something something tmpfs
00:14 falkenb0t left #git
00:14 MattMaker joined #git
00:16 ASOLAr joined #git
00:25 mingrammer joined #git
00:30 d5sx43 joined #git
00:33 beyertech joined #git
00:34 beyertech joined #git
00:34 MaddHatter left #git
00:35 beyertech joined #git
00:36 beyertech joined #git
00:40 tilerendering_ joined #git
00:41 UserOO7 joined #git
00:43 UserOO7 joined #git
00:49 cagedwisdom joined #git
00:53 cdown joined #git
00:54 clemf joined #git
00:56 UserOO7 joined #git
00:56 sangy joined #git
00:56 UserOO7 joined #git
00:57 anonymuse joined #git
00:59 MattMaker joined #git
01:02 d0nn1e joined #git
01:02 ahmed_elgabri joined #git
01:02 wilhelmtell joined #git
01:02 wilhelmtell left #git
01:03 mycyber joined #git
01:06 clemf joined #git
01:08 cagedwisdom left #git
01:09 MattMaker joined #git
01:15 Electrometro joined #git
01:18 janx joined #git
01:18 Anupkumar joined #git
01:18 kwmiebach joined #git
01:19 stealthii joined #git
01:19 MattMaker joined #git
01:19 huhlig joined #git
01:20 mingrammer joined #git
01:20 bbhoss joined #git
01:20 pizzaops joined #git
01:20 devhost joined #git
01:21 ytl joined #git
01:22 ytl_ joined #git
01:23 yoyoyo___ joined #git
01:23 PioneerAxon_ joined #git
01:24 rfv joined #git
01:25 cstrahan joined #git
01:26 mycyber joined #git
01:26 Lowell joined #git
01:27 pfg joined #git
01:27 fahadash joined #git
01:28 cloudcell_ joined #git
01:31 paperziggurat joined #git
01:32 clemf joined #git
01:33 martin_g joined #git
01:33 macivy joined #git
01:34 barq joined #git
01:34 ASOLAr joined #git
01:34 aendrew joined #git
01:35 HanClinto joined #git
01:35 Grievar joined #git
01:35 ulkesh joined #git
01:35 theverbg_ joined #git
01:37 Electrometro joined #git
01:37 Lewix joined #git
01:38 magikid joined #git
01:39 sebhoss joined #git
01:40 Jellyg00se joined #git
01:40 unholycrab joined #git
01:41 cory_ joined #git
01:41 joseph_arnstein joined #git
01:43 texasmynsted joined #git
01:45 Electrometro joined #git
01:49 MattMaker joined #git
01:51 pks joined #git
01:52 HoierM joined #git
01:52 rgrinberg joined #git
01:53 Finnoloid joined #git
01:54 fakenerd joined #git
01:54 lebster joined #git
01:57 bronson joined #git
01:58 anonymuse joined #git
01:58 d^sh joined #git
01:58 Vampire0 joined #git
01:58 dreiss joined #git
01:59 Goplat joined #git
01:59 MattMaker joined #git
02:00 cagmz joined #git
02:01 hahuang61 joined #git
02:03 ahmed_elgabri joined #git
02:10 sanketdg joined #git
02:12 zacts_pi joined #git
02:13 MattMaker joined #git
02:14 Bilge joined #git
02:16 Spydar007 joined #git
02:16 Spydar007 joined #git
02:17 lightstalker joined #git
02:21 arescorpio joined #git
02:22 dinoocch joined #git
02:23 Aces_Charles joined #git
02:27 mikeric joined #git
02:28 PioneerAxon joined #git
02:28 hexagoxel joined #git
02:29 MattMaker joined #git
02:31 watabou joined #git
02:33 lightstalker joined #git
02:35 hobodave joined #git
02:37 dreiss joined #git
02:39 MattMaker joined #git
02:39 CrazyBonz joined #git
02:39 qqqqq joined #git
02:41 chachasmooth joined #git
02:41 romerocesar joined #git
02:44 pijiu joined #git
02:44 fstd joined #git
02:47 pijiu joined #git
02:47 pijiu joined #git
02:48 pijiu2 joined #git
02:48 pijiu joined #git
02:48 pijiu joined #git
02:50 lagothri1 joined #git
02:51 pijiu joined #git
02:53 PioneerAxon joined #git
02:53 iskander joined #git
02:54 MattMaker joined #git
02:56 chrisshattuck joined #git
02:57 aidalgol joined #git
02:58 chrisshattuck joined #git
02:58 clemf joined #git
02:58 anonymuse joined #git
03:00 sandstrom joined #git
03:01 beyertech joined #git
03:02 dreiss joined #git
03:04 ahmed_elgabri joined #git
03:04 ASOLAr joined #git
03:12 leftriver44 joined #git
03:12 clemf joined #git
03:13 pijiu2 joined #git
03:13 Electrometro joined #git
03:14 pijiu joined #git
03:16 lolmac joined #git
03:16 sssilver joined #git
03:19 MattMaker joined #git
03:19 chrisshattuck joined #git
03:20 sssilver joined #git
03:23 mikeric joined #git
03:24 chrisshattuck joined #git
03:24 atomicb0mb joined #git
03:26 Bilge joined #git
03:28 kadoban joined #git
03:29 chrysa joined #git
03:29 Lewix joined #git
03:32 LUMIA930 joined #git
03:33 Lewix joined #git
03:41 Dougie187 left #git
03:42 sssilver joined #git
03:45 nintendo3DS joined #git
03:46 kn-928 joined #git
03:46 ASOLAr joined #git
03:47 ertes left #git
03:47 energizer left #git
03:48 clemf joined #git
03:49 MattMaker joined #git
03:51 Hink joined #git
03:54 morganq joined #git
03:54 tanimislam joined #git
03:54 morganq left #git
03:55 Darren_ joined #git
03:55 drbean joined #git
03:57 mehola joined #git
03:57 bronson joined #git
03:59 MattMaker joined #git
03:59 anonymuse joined #git
04:01 smoores joined #git
04:01 ASOLAr joined #git
04:01 thecomedian joined #git
04:01 smoores how do i go back to a specific commit and put all changes since then in a different branch
04:02 gkatsev you can cherry-pick a range of commits
04:02 gkatsev something like `git cherry-pick treeish..treeish`
04:03 hahuang61 joined #git
04:04 MattMaker joined #git
04:04 ahmed_elgabri joined #git
04:07 govg joined #git
04:09 Feelgood joined #git
04:09 daey_ joined #git
04:10 Cabanossi joined #git
04:10 Manuel15 joined #git
04:10 Manuel15 joined #git
04:14 chrisshattuck joined #git
04:18 chrisshattuck joined #git
04:20 phanimahesh joined #git
04:33 chrisshattuck joined #git
04:33 clemf joined #git
04:33 zmachine joined #git
04:38 durham joined #git
04:39 MattMaker joined #git
04:42 EvilPenguin joined #git
04:45 NlkIoUxhGD joined #git
04:51 cyphase joined #git
04:51 EvilPenguin joined #git
04:52 dreiss joined #git
04:57 klee joined #git
04:57 Manuel15 joined #git
04:57 Manuel15 joined #git
04:58 harish joined #git
04:59 steven_a_s joined #git
04:59 leftriver48 joined #git
05:00 leftriver48 Hello, I was wondering if anyone can help in retrieving deleted files
05:04 choki_ joined #git
05:05 ahmed_elgabri joined #git
05:08 sssilver joined #git
05:09 MattMaker joined #git
05:10 netj joined #git
05:11 MrWoohoo joined #git
05:18 MacWinne_ joined #git
05:19 MattMaker joined #git
05:20 ruskie joined #git
05:20 phaleth joined #git
05:23 chrysa joined #git
05:23 subhojit777 joined #git
05:24 subhojit777 joined #git
05:24 freimatz joined #git
05:25 cdown joined #git
05:25 subhojit777 joined #git
05:27 nwkj86 joined #git
05:29 MattMaker joined #git
05:30 egg_ joined #git
05:32 hahuang61 joined #git
05:32 bernardio joined #git
05:33 subhojit777 joined #git
05:34 atomi joined #git
05:34 atomi anybody know if you can use a private key in an environment variable in git (without echoing to file and chmoding)
05:35 uDMCIOLLth joined #git
05:36 kadoban atomi: For SSH auth?
05:36 atomi yeah
05:37 kadoban atomi: I'd look for something in SSH. Not sure if it can be done though.
05:37 atomi ok
05:37 thiago I don't think it can
05:37 mingrammer joined #git
05:39 MattMaker joined #git
05:43 a_thakur joined #git
05:43 SwiftMatt joined #git
05:44 asifx joined #git
05:47 phanimahesh joined #git
05:49 MattMaker joined #git
05:59 ASOLAr joined #git
05:59 bronson joined #git
05:59 stonerfish joined #git
06:00 HanClinto joined #git
06:06 ahmed_elgabri joined #git
06:11 dreiss joined #git
06:12 LUMIA930 joined #git
06:19 MattMaker joined #git
06:20 smoores joined #git
06:23 beyertech joined #git
06:24 beyertech joined #git
06:28 sanketdg joined #git
06:31 atomi hmmm I can do `echo $PRIVATE_KEY | ssh -i /dev/stdin ...`
06:32 atomi and somehow add it to GIT_SSH env variable
06:32 atomi that's the best I got :/
06:32 shinnya joined #git
06:33 t0by joined #git
06:34 bocaneri joined #git
06:35 j416 atomi: what is the use case for this?
06:37 atomi j416, my CI tool injects ssh key to build containers as env vars
06:37 j416 ah, I see
06:38 atomi yeah I was hoping I wouldn't need to wrap commands in a script but it looks like I'm going to have to do that
06:40 j416 not sure if it's any cleaner of it it helps but `ssh -i <(echo $PRIVATE_KEY)` is at least less typing
06:42 przm_ joined #git
06:42 j416 `ssh -i <(echo "$PRIVATE_KEY")` even.
06:42 atomi j416, yeah that worked
06:42 atomi j416, thanks!
06:43 j416 or perhaps you could add the key to ssh-agent if you have one
06:43 Willchalfan joined #git
06:44 thiago indeed it sounds like a problem that the agent exists to solve
06:48 atomi yeah I'll sleep on it, it's getting late
06:50 TuriTyr joined #git
06:54 MattMaker joined #git
06:54 axisys joined #git
06:56 Raging_Hog joined #git
07:00 ASOLAr joined #git
07:01 midnightmagic joined #git
07:03 midnightmagic Hello. In the event someone force-pushes and destroys some branches and/or disconnects some history and does a gc, are the disconnected commits destroyed permanently? that is, say I want to try hard to mirror a repository, and I consider as much history as I've ever received as a client as possible to be very important: is there a way to maintain a space-efficient copy of *everything* I fetch no matter
07:03 midnightmagic what the upstream does to mangle their repo?
07:04 _ikke_ use a --mirror clone, and enable core.logAllRefUpdates
07:05 _ikke_ A mirror clone (bare repo) will fetch all refs
07:05 Endarked joined #git
07:05 _ikke_ and logAllRefUpdates will enable the reflog (which is by default disabled on bare repositories), which gives you 90 days of 'backup'
07:06 _ikke_ Then you need to make sure you regularly update that repo
07:07 ahmed_elgabri joined #git
07:09 Shakeel__ joined #git
07:10 __xor joined #git
07:10 Thorn joined #git
07:10 ItSANg___ joined #git
07:11 adante_ joined #git
07:12 kwmiebach_ joined #git
07:12 sandstrom joined #git
07:13 sssilver joined #git
07:13 d3r1ck_ joined #git
07:13 grift_ joined #git
07:13 albel727_ joined #git
07:13 ollien_ joined #git
07:13 helium-3 joined #git
07:13 jave_ joined #git
07:13 gnarf_ joined #git
07:13 deltab_ joined #git
07:13 florian^ joined #git
07:14 LHL_Jordan joined #git
07:14 tonyj_ joined #git
07:14 rudi_s_ joined #git
07:14 jlewis joined #git
07:14 rcz joined #git
07:14 snowinferno_ joined #git
07:14 Afforess_ joined #git
07:14 grindhold_ joined #git
07:14 unforgiven512_ joined #git
07:14 ffualo_ joined #git
07:14 Kuukunen- joined #git
07:15 snits_ joined #git
07:15 ribasushi_ joined #git
07:15 unforgiven512_ joined #git
07:15 rxo joined #git
07:15 polyzen_ joined #git
07:17 naw joined #git
07:17 drupald joined #git
07:17 Esya joined #git
07:18 guampa joined #git
07:18 TheMoonMaster joined #git
07:18 ruskie joined #git
07:18 Ram-Z_ joined #git
07:19 nydel07 joined #git
07:19 Gitzilla joined #git
07:20 markovh joined #git
07:20 jab416171 joined #git
07:20 ninsei joined #git
07:20 u1106 joined #git
07:20 diogenese joined #git
07:21 LiENUS joined #git
07:21 iveqy joined #git
07:22 cloudcell__ joined #git
07:22 vuoto joined #git
07:23 mykespb joined #git
07:24 MattMaker joined #git
07:29 ojdo joined #git
07:31 Mobutils_ joined #git
07:31 mikeh__ joined #git
07:32 hahuang61 joined #git
07:34 Rodya_ joined #git
07:34 tvw joined #git
07:38 jrahmy_ joined #git
07:40 wloncom joined #git
07:44 cyan__ joined #git
07:45 swalladge joined #git
07:47 nitin joined #git
07:48 zarel joined #git
07:54 MattMaker joined #git
07:59 MattMaker joined #git
08:01 bronson joined #git
08:04 ochorocho__ joined #git
08:07 ahmed_elgabri joined #git
08:09 MattMaker joined #git
08:10 LucaTM joined #git
08:11 jrahmy_ joined #git
08:15 jknetl joined #git
08:15 rgrinberg joined #git
08:20 nitin joined #git
08:20 ahmed_elgabri joined #git
08:23 diogenese joined #git
08:34 mingrammer joined #git
08:38 KindOne joined #git
08:38 KindOne left #git
08:39 MattMaker joined #git
08:41 GavinMagnus joined #git
08:42 nitin joined #git
08:46 n-st joined #git
08:50 jas4711 joined #git
08:51 mikeh__ joined #git
08:53 xunie-laptop joined #git
08:54 xunie-laptop joined #git
08:54 subhojit777 joined #git
08:55 subhojit777 joined #git
08:55 subhojit777 joined #git
09:00 n-st joined #git
09:09 MattMaker joined #git
09:10 ki0 joined #git
09:12 buffal0 joined #git
09:13 robotroll joined #git
09:13 aax joined #git
09:14 MattMaker joined #git
09:18 n-st joined #git
09:18 vuoto joined #git
09:22 navidr joined #git
09:23 harish joined #git
09:24 MattMaker joined #git
09:28 stasmakarov joined #git
09:28 bjoe2k4 joined #git
09:28 nitin joined #git
09:29 mingrammer joined #git
09:33 hahuang61 joined #git
09:33 n-st joined #git
09:34 MattMaker joined #git
09:38 aard_ joined #git
09:44 n-st joined #git
09:45 nitin joined #git
09:50 rgrinberg joined #git
09:50 GenZai joined #git
09:52 buffffal00 joined #git
09:52 daynaskully joined #git
09:53 ki0 joined #git
09:56 mehola joined #git
09:56 n-st joined #git
10:00 ahmed_elgabri joined #git
10:01 dreamyspell joined #git
10:03 energizer joined #git
10:03 bronson joined #git
10:04 energizer I'm working with a small group, would it be typical to merge my work daily into the project's remote?
10:16 freimatz joined #git
10:19 m0viefreak joined #git
10:21 osse energizer: in general no. it would be typical to merge your work once you have a concrete piece of work worth merging, eg. a feature or bug fix. Whether this happens once a day, once a week or several times day depends on the work you do.
10:21 osse energizer: a schedule is not a good idea
10:22 energizer osse: ok, what do i do with my changes in the meantime to back them up
10:22 osse energizer: if you're concerned about not keeping up to date, lagging behind and so on: With git you can reverse the flow until you're ready: merge the remote work into yours
10:23 osse energizer: to back up, you can push your work to a fork, or push it to a specific branch on the remote that "yours" with a common understanding that it's not ready yet
10:24 n-st joined #git
10:24 Faylite joined #git
10:24 mgoodwin git checkout -b newbranch-WIP-NOMERGE && git add . && git commit -m wip && git push -u origin newbranch-WIP-NOMERGE
10:25 energizer i see
10:25 mgoodwin When you're ready to work again, git checkout newbranch-WIP-NOMERGE && git reset HEAD^ && git checkout <actual_branch> && git push -u origin :newbranch-WIP-NOMERGE && git branch -D newbranch-WIP-NOMERGE
10:26 mgoodwin you can script that and add alias in ~/.gitconfig [alias]
10:27 energizer mgoodwin: whats going on in that latter one
10:29 arand joined #git
10:29 mariuscc joined #git
10:31 yoan_ joined #git
10:32 mgoodwin it moves the head to the prior commit and drops the index - the changes that were previously unstaged/uncommitted look that way again
10:33 mgoodwin then when you checkout the actual branch you want to work on - it merges those uncommitted/unstaged changes with the checked out branch
10:34 palashot joined #git
10:34 mgoodwin lastly, `git push -u origin :newbranch-WIP-NOMERGE` deletes the branch on the remote, and then `git branch -D newbranch-WIP-NOMERGE` deletes the local branch forcefully
10:36 vuoto joined #git
10:37 acqyl_ joined #git
10:39 ljc joined #git
10:39 energizer ok that'll take some mulling over, thanks ya
10:41 ochorocho__1 joined #git
10:45 dreamyspell joined #git
10:45 osse I think pushing to a branch named energizer/foo is slightly better. that way you can push energizer/bar as well. assuming you agree in the team that branches by the name 'username/blah' is "private" (for lack of a better word).
10:46 mgoodwin sure
10:47 osse But imho. the *best* approach is having a fork, which is usually no issue if your company uses github or gitlab or any of the popular hosting solutions. With this approach the rest of the team doesn't have to look at your crap :p
10:47 mgoodwin newbranch was more of a variable to the user than a name in my example, I suppose that was not clear
10:47 osse by wich I mean they won't  automatically appear i their 'git branch -r'
10:47 mgoodwin forks are good too
10:48 mgoodwin Me personally though, I'm not about to fork my own project so I just do that if I'm afraid my computers going to blow up and I need to backup some WIP state
10:49 osse sure. the forking only makes sense in a team
10:49 sdothum joined #git
10:50 rahtgaz joined #git
10:50 osse e.g. at work I work in a team on a piece of software called CoolApp. it's hosted at https://git.company.com/projectgroup/CoolApp.git. Build server gets stuff from this repo's master, etc. etc.  And I have a fork at https://git.company.com/osse/CoolApp.git
10:51 mikeh__ joined #git
10:52 n-st joined #git
10:52 rahtgaz joined #git
10:53 energizer osse: and on that fork you make plenty of feature branches, which you delete before merging them into dev or master, then push to origin?
10:53 osse (I have to admit that we have no work instruction or anything for this. I just did it anyway because I can)
10:54 gajus in a pre-commit hook, how do I get the files/lines of the staged code?
10:56 ljc joined #git
10:56 osse energizer: among other things yes.
10:57 osse energizer: sometimes i push them to origin first for others too look at (if they're too lazy to add my fork as a second remote)
10:57 osse gajus: you can extract it from git diff --staged
11:00 osse gajus: you can get file names and number of lines etc. pretty easily by various --options to git diff, but there doesn't seem to be an easy way of extracting the specific line numbers other than parsing the @@ hunk headers.
11:01 gajus osse thank you
11:01 n-st joined #git
11:01 gajus I have found several abstractions for the task
11:01 gajus In fact, I have found a tool that does what my original intention was https://github.com/okonet/lint-staged
11:02 vuoto joined #git
11:03 mehola joined #git
11:03 mingrammer joined #git
11:03 osse Extra points awarded for Unicode poop in the readme
11:04 jost joined #git
11:04 MattMaker joined #git
11:06 vuoto joined #git
11:06 mgoodwin heh.
11:06 choki joined #git
11:07 osse It's actually the most graceful use that character I've seen
11:09 smoores joined #git
11:09 n-st joined #git
11:10 blackwind_123 joined #git
11:12 dsdeiz joined #git
11:12 dsdeiz joined #git
11:13 ljc joined #git
11:16 nuck joined #git
11:18 n-st joined #git
11:18 ojdo joined #git
11:19 buffal0 joined #git
11:23 zuloyd joined #git
11:23 zuloyd hi
11:23 gitinfo zuloyd: 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.
11:23 zuloyd I have a git repository with a private submodule. My .gitmodules file contains "url = git@xyz.github.com:XYZ/vectorgraphics2d.git"
11:23 zuloyd when running "git submodule update", how can I supply credentials for accessing the private submodule without altering the .gitmodules file?
11:26 ljc joined #git
11:26 n-st joined #git
11:34 hahuang61 joined #git
11:34 MattMaker joined #git
11:36 mycyber joined #git
11:36 n-st joined #git
11:37 cyan__ joined #git
11:47 Gurkenglas joined #git
11:49 MattMaker joined #git
11:50 Anupkumar hi, I accidently committed my local changes and when I am trying to push, it is saying:
11:50 Anupkumar https://www.irccloud.com/pastebin/DB199Ffi/
11:50 Anupkumar how can I get my changes back by stashing the local commit
11:52 LucaTM_ joined #git
11:52 Anupkumar osse: ping
11:53 n-st joined #git
11:55 danslo joined #git
11:56 pijiu joined #git
11:56 mikeh__ joined #git
11:57 tomog999_ joined #git
11:58 mingrammer joined #git
11:59 fahadash joined #git
11:59 vuoto joined #git
11:59 MattMaker joined #git
12:01 ochorocho__ joined #git
12:03 n-st joined #git
12:03 mehola joined #git
12:06 satifant joined #git
12:07 subhojit777 joined #git
12:10 jottr joined #git
12:10 spacelord joined #git
12:11 str joined #git
12:12 n-st joined #git
12:20 buffal0 joined #git
12:22 dviola joined #git
12:22 n-st joined #git
12:24 MattMaker joined #git
12:25 toogley joined #git
12:26 ochorocho__ joined #git
12:29 PioneerAxon joined #git
12:32 n-st joined #git
12:35 hahuang61 joined #git
12:38 sat-aton joined #git
12:39 synthmeat joined #git
12:41 mgoodwin If you didn't want that commit, just git reset HEAD^
12:41 piling joined #git
12:41 n-st joined #git
12:41 mgoodwin That will move the HEAD back one, but keep the working changes
12:42 mgoodwin Or, you could `git pull` and likely it would ask you to merge
12:43 sat-aton__ joined #git
12:51 n-st joined #git
12:51 pamplemousse joined #git
12:51 PioneerAxon joined #git
12:52 pamplemousse joined #git
12:54 MattMaker joined #git
12:56 kadoban joined #git
12:58 tureba joined #git
12:58 jost_ joined #git
12:59 anuxivm joined #git
13:01 n-st joined #git
13:04 mariuscc joined #git
13:07 bronson joined #git
13:09 MattMaker joined #git
13:12 n-st joined #git
13:13 buffffal00 joined #git
13:15 SteffanW joined #git
13:23 v60r joined #git
13:23 n-st joined #git
13:24 safinn joined #git
13:24 Endarked joined #git
13:27 safinn Hi, I have setup a bare git repo on my server and with my local repo setup a remote to that bare repo. I setup a hook on the post-receive event to perform a command 'git --work-tree=/var/www/beta --git-dir=/var/repo/beta.git checkout -f' but im not sure what exactly is going on here. when i push to the remote from my local what does that command do?
13:28 safinn it has checkout but no branch name. so does it just checkout whatever was just pushed not matter what branch?
13:29 subhojit_ joined #git
13:29 Manuel15 joined #git
13:29 Manuel15 joined #git
13:31 waruqi joined #git
13:34 n-st joined #git
13:34 MattMaker joined #git
13:34 subhojit777 joined #git
13:36 tabrez joined #git
13:37 satifant joined #git
13:45 darkbit joined #git
13:46 mingrammer joined #git
13:46 n-st joined #git
13:49 MattMaker joined #git
13:52 armenzg joined #git
13:52 mycyber joined #git
13:54 tcsc joined #git
13:56 shinnya joined #git
13:57 n-st joined #git
13:57 Suigetsu joined #git
13:58 eagles0513875_ joined #git
13:58 eagles0513875_ hey guys what is the best way to migrate an svn repo to git
13:58 raijin joined #git
13:59 _ikke_ No experience, but something like https://github.com/nirvdrum/svn2git?
13:59 MattMaker joined #git
14:01 Shentino what is the command to push local branch xyz to remote abc's branch ijk?
14:02 _ikke_ git push abc xyz:ijk
14:03 ASOLAr joined #git
14:04 monoprotic joined #git
14:04 SoRoot joined #git
14:04 dviola joined #git
14:06 Shentino thank you
14:09 tabrez joined #git
14:09 MattMaker joined #git
14:10 snfgf joined #git
14:10 snfgf Hmm!
14:11 snfgf I have a user 'git' on a server, and public key of a user in authorized_keys, yet when I attempt to push to origin, I am asked for git@domain's password?
14:12 _ikke_ snfgf: ssh -vv git@domain
14:17 ramsub07 joined #git
14:17 nullie snfgf: do you have private key of user 'git' in your .ssh ?
14:17 nullie snfgf: do you have private key of user 'git' in your .ssh ?
14:17 nullie g
14:18 ramsub07 Hi. I have rebased my branch with master. I now want to roll back to my branch before rebase, ignoring all the commits post rebase. How do i proceed ?
14:20 _ikke_ ramsub07: git reset --keep <branch>@{1}
14:20 _ikke_ This will reset the branch back to it's previous position
14:21 n-st joined #git
14:21 davisonio joined #git
14:22 buffal0 joined #git
14:24 ramsub07 _ikke_: i'm getting this, fatal: Cannot do keep reset with paths.
14:25 _ikke_ what command did you enter?
14:26 snfgf nullie, I do not. I thought I just needed the public keys of the users I wanted to be able to commit to the remote repo in ~/git/.ssh/authorized_keys
14:27 ramsub07 _ikke_: git reset --keep cgt-rb-1 @ 1e3269642429f46602de91bdc1b772f1d907daa2
14:27 ramsub07 where, cgt-rb-1 is the name of branch
14:28 nullie snfgf: contents of your local ~/.ssh/id_rsa.pub need to be in ~/.ssh/authorized_keys on server
14:29 snfgf nullie, yerp, i have that O_o
14:29 dviola joined #git
14:29 nullie snfgf: ~/.ssh/, not ~/git/.ssh
14:29 snfgf debug1: Offering RSA public key: /home/rwiggan/.ssh/id_rsa
14:30 snfgf debug2: we sent a publickey packet, wait for reply
14:30 snfgf debug1: Authentications that can continue: publickey,password
14:30 snfgf debug1: Trying private key: /home/rwiggan/.ssh/id_dsa
14:30 snfgf why is it trying private key :s
14:30 fstd joined #git
14:31 snfgf Hmmmm.
14:31 snfgf Perhaps...
14:32 snfgf I must have AllowUser my_user in sshd_config
14:32 snfgf even though i don't really want to give these users ssh access
14:33 Faylite joined #git
14:33 n-st joined #git
14:33 mingrammer joined #git
14:34 bket joined #git
14:34 gusnan joined #git
14:34 gusnan joined #git
14:34 MattMaker joined #git
14:35 snfgf nope, that didn't do it
14:35 hahuang61 joined #git
14:36 buffal0 joined #git
14:36 * snfgf cogitates
14:36 fstd_ joined #git
14:36 * snfgf pretends to cogitate while waiting for somebody to tell him what to do
14:38 _ikke_ snfgf: The server is not accepting the public key
14:38 dreiss joined #git
14:39 _ikke_ So you need to find out whyw
14:41 Suigetsu Hi, I had a doubt. Suppose I have two branches A and B. Here, how is 'git merge A B' different from 'git merge B A'? Do they differ in any way?
14:42 _ikke_ Suigetsu: Usually you use git merge only with one branch
14:42 _ikke_ git merge A, while in B or the opposite
14:42 Suigetsu Oh.
14:42 _ikke_ git merge A B will create an octopus merge, a merge that merges more than 2 branches
14:43 Suigetsu So, if I checkout branch A, and I use git merge B, I get the commits of B into A? Does branch B get the commits of A as well?
14:43 mingrammer joined #git
14:43 _ikke_ No, nothing happens to B in that case
14:44 dviola joined #git
14:44 Suigetsu Oh, okay.
14:49 mohabaks joined #git
14:50 snfgf _ikke_, key authentication works fine when I ssh into my_user. Then I copy ~/my_user/.ssh/authorized_keys to ~/git/.ssh/authorized keys, and try to commit and the key authentication fails
14:50 ahmed_elgabri joined #git
14:51 snfgf _ikke_, in user git's .ssh directory, there is only currently the file authorized_keys
14:52 snfgf do i need anything else in there?
14:52 _ikke_ snfgf: not sure, but did you check the permissions of that file?
14:52 _ikke_ ssh can be picky of these things
14:54 subhojit_ joined #git
14:54 snfgf .ssh is rwx------, .ssh/authorized_keys is rw-------
14:55 _ikke_ owner?
14:56 vuoto joined #git
14:57 n-st joined #git
14:57 cyan__ joined #git
14:59 MattMaker joined #git
14:59 nydel07 joined #git
15:00 spudowiar joined #git
15:01 satifant joined #git
15:02 l4v2 joined #git
15:04 diego2 joined #git
15:05 diego2 joined #git
15:05 ASOLAr joined #git
15:06 thiago joined #git
15:07 kus joined #git
15:08 rgrinberg joined #git
15:09 bronson joined #git
15:09 MattMaker joined #git
15:10 SoRoot joined #git
15:10 rubyonrailed joined #git
15:12 n-st joined #git
15:12 jon-mac joined #git
15:13 blackwind_123 joined #git
15:16 mariuscc joined #git
15:16 zacts joined #git
15:16 kaiJoe joined #git
15:16 CheckDavid joined #git
15:17 ramsub07 hello, how do i remove all commits from a branch from a previous rebase ?
15:18 buffal0 joined #git
15:20 monoprotic joined #git
15:20 monoprotic joined #git
15:22 buffal0 joined #git
15:23 fakenerd joined #git
15:24 Goplat joined #git
15:24 diprotic joined #git
15:25 n-st joined #git
15:25 mikeym joined #git
15:27 mikeym joined #git
15:27 mikeym joined #git
15:27 mikeym joined #git
15:28 ahmed_elgabri joined #git
15:29 mingrammer joined #git
15:33 Gamecubic joined #git
15:34 MattMaker joined #git
15:39 n-st joined #git
15:39 cyphase joined #git
15:39 Rodya_ joined #git
15:43 snowkidind joined #git
15:43 Finnoloid joined #git
15:49 MattMaker joined #git
15:49 HanClinto joined #git
15:51 subhojit__ joined #git
15:52 aniceguy joined #git
15:53 n-st joined #git
15:54 aniceguy hello
15:54 gitinfo aniceguy: 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.
15:55 zacts joined #git
15:56 xelxebar joined #git
15:58 raijin joined #git
15:59 LUMIA930 joined #git
15:59 MattMaker joined #git
15:59 subhojit__ joined #git
16:00 sbeller_ joined #git
16:01 nomicos joined #git
16:02 subhojit_ joined #git
16:03 spudowiar joined #git
16:06 subhojit__ joined #git
16:06 jaafar joined #git
16:06 ahmed_elgabri joined #git
16:07 n-st joined #git
16:10 bronson joined #git
16:10 InfoTest joined #git
16:11 Munt joined #git
16:11 d0nn1e joined #git
16:11 BlaXpirit who needs !backup tho, reflog got everything
16:11 gitinfo 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
16:12 BlaXpirit but yes, this is the only useful kind of backup
16:12 _ikke_ git is in no way a backup
16:12 _ikke_ BlaXpirit: and the reflog does not cover not-comitted changes
16:13 subhojit_ joined #git
16:16 spudowiar And even though you can get the index back when not committed, who wants to wade through all sorts of files to find the one you're looking for?
16:16 spudowiar Instead, just backup the whole folder
16:16 leeN joined #git
16:16 spudowiar I'm guilty of not doing this though, I'll perform a detached commit instead hehe :)
16:18 _ikke_ index only helps when you've staged anything
16:18 MattMaker joined #git
16:19 calamari joined #git
16:19 Endarked_ joined #git
16:20 subhojit__ joined #git
16:20 ShekharReddy joined #git
16:21 calamari I have some files outside my repository directory that I'd like to store the file contents of in the git repository (config files and such). Should I use symlinks, hard links, something else?
16:21 thiago hard links or copy
16:22 _ikke_ put them in the repo, and symlink to them
16:22 calamari thiago: cool, thanks. I was afraid it would somehow store a link rather than the actual file contents
16:22 _ikke_ hardlinks break
16:22 _ikke_ calamari: it will
16:22 thiago a symlink would
16:22 thiago not a ahrdlink
16:22 _ikke_ hardlinks will break
16:22 thiago _ikke_'s suggestion is better
16:22 calamari it's okay if the link breaks as long as the file contents are preserved
16:22 thiago move them into the repository and symlink from where they used to be
16:23 n-st joined #git
16:23 subhojit_ joined #git
16:24 calamari _ikke_: I considered that as well
16:24 MattMaker joined #git
16:25 calamari anyhow, I think you answered my question.. I'll use a hard link, and if/when my disk dies I'll just deal with setting back up the links, will be the least of my problems, because at least I'll have the contents preserved
16:25 calamari thanks
16:26 _ikke_ calamari: note that things like checkout will break the hardlinks, making the files not updated anymore
16:26 _ikke_ on the other side
16:26 BlaXpirit :(
16:26 BlaXpirit sounds like hardlinks are totally useless in git then
16:27 calamari _ikke_: ahh I see. that is a nuisance for sure
16:29 MattMaker joined #git
16:30 sanketdg joined #git
16:30 _ikke_ hardlinks are just normal files to git
16:30 _ikke_ so anytime an unlink is done, the link breaks
16:31 _ikke_ Not sure under what circumstances git will use unlink
16:31 blueyed joined #git
16:31 cdg joined #git
16:33 blueyed joined #git
16:34 zmachine joined #git
16:34 subhojit__ joined #git
16:35 MattMaker joined #git
16:36 hahuang61 joined #git
16:39 n-st joined #git
16:39 Samual joined #git
16:47 ahmed_elgabri joined #git
16:47 aniceguy hi
16:47 osse my name is
16:47 t0by joined #git
16:47 alphor wha?
16:48 subhojit_ joined #git
16:48 vuoto joined #git
16:48 durham joined #git
16:48 _ikke_ my name is
16:48 Seveas huh?
16:49 aniceguy Currently I have 6 commits in a dev branch. I need to modify a file in the root commit, without affecting the other 5 commits.  Is that really possible?
16:49 osse c-c-c-combo breaker!!!
16:49 Seveas damn.
16:50 aniceguy I went through numerous articles...but still with no success
16:50 Seveas Also, I feel old. That song is 17(!) years old already
16:50 Seveas it's from last century.
16:50 osse aniceguy: technically no. the SHA1s of all the other commits need to change, but in human terms they can be "identical"
16:50 osse aniceguy: in the sense that the represent the same changes, with the same message, author, date, and so on
16:50 osse *they represent
16:50 durham joined #git
16:51 subhojit__ joined #git
16:51 aniceguy i see. It is okay for sha1 of all commits to change. I only wish to modify a file in the root commit. The rest of other 5 commits' files should be unaffected.
16:51 osse Seveas: for added effect: last millennium.
16:51 okgo joined #git
16:52 Seveas that actually feels less bad than last century. Dunno why.
16:52 _ikke_ aniceguy: man git replace
16:52 gitinfo aniceguy: the git-replace manpage is available at http://jk.gs/git-replace.html
16:52 osse aniceguy: by root commit do you mean the first commit ever created in this repo?
16:52 aniceguy yes
16:52 osse aniceguy: git rebase -i --root. mark the first commit 'edit'. follow the instruction. no problemo.
16:53 _ikke_ osse: That would carry the change on to the other commits
16:53 aniceguy <osse>: when i do git rebase -i --root, my editor opens, and I saw many pick for each of the commit in the branch.
16:54 aniceguy i change the pick to edit for first commit. The remaining pick, leave it as it is?
16:54 _ikke_ yes
16:54 osse _ikke_: yes, my interpretation is this is what he wants.
16:55 aniceguy actually i done this before, and i notice that my first commit is changed, but the rest of 5 commits disappear.
16:55 n-st joined #git
16:56 _ikke_ aniceguy: They will be there when you finish the rebase
16:56 ArchNoob joined #git
16:56 aniceguy <_ikke_>: ok. I try again.
16:57 osse aniceguy: just to be clear, you mean that the changes made by the other 5 commits should be the same right? or do you want the second commit to immediately undo the effects of this change you to do the first commit?
16:57 osse (Shit, I asked two questions where I hope for one yes and one no. this might get confusing)
16:58 _ikke_ hehe
16:58 danslo_ joined #git
16:58 aniceguy <osse> yes, the changes made by the other 5 commits should remain the same
16:58 osse good. you may proceed
16:59 osse you have my blessing
16:59 madewokherd joined #git
16:59 osse aniceguy: you clarify: after you change pick to edit you're supposed to close the editor. make your changes. commit --amend then rebase --continue
17:00 osse only after the continue will you see the 5 other commits appear again
17:00 osse *to clarify
17:00 Rodya_ joined #git
17:01 osse _ikke_: quick Q since I'm lazy: When I see stuff like $gmane/12345 do you know how I'd look that up in e.g. public-inbox? (or any other online archive for that matter)
17:02 aniceguy the git prompt me to amend now. I have change my local copy. So i proceed to git add , and then followed by git commit --amend ?
17:02 osse yes
17:04 aniceguy i have done git commit --amend. Now when i do git log, i saw only 1 commit
17:04 aniceguy is the rebase considered finish?
17:04 BlaXpirit aniceguy, now u need  git rebase --continue
17:04 osse like I said (and git said), run git rebase --continue
17:04 BlaXpirit doesn't it say that?
17:06 blueyed joined #git
17:06 nitin joined #git
17:06 osse yes
17:06 _ikke_ osse: http://public-inbox.org/git/2​0160811075628.GA24690@starla/
17:06 osse _ikke_: thanks!
17:07 Jackneill joined #git
17:08 aniceguy I have run git rebase --continue. It actually prompt warning that it cannot merge my file from the head to second commit
17:08 osse aniceguy: then you have changed something that the second commits expected to find
17:08 osse aniceguy: run 'git diff'
17:10 aniceguy is it possible to skip the merging for rest of the commits, since I only interested to amend just the root commit
17:10 subhojit_ joined #git
17:10 osse it's possible there is only this one conflict to deal with
17:11 osse but no, you cannot skip it
17:11 zacts joined #git
17:12 _ikke_ git checkout --theirs <file>
17:12 gusnan joined #git
17:12 osse heh, that's one option
17:13 aniceguy what option?
17:13 osse and after further consideration, probably a good one
17:16 efajzioe joined #git
17:19 govg joined #git
17:19 NeXTSUN joined #git
17:22 cdg_ joined #git
17:23 MattMaker joined #git
17:24 GenZai joined #git
17:24 aniceguy my git show=>   Unmerged paths: both modified:   file.xlsm
17:25 aniceguy file.xlsm is a excel file, to be more specific, it is a binary file.
17:25 davisonio joined #git
17:25 subhojit777 joined #git
17:25 aniceguy How to resolve conflict for this case, since they are both binary?
17:26 osse aniceguy: can you explain what results you want to achieve?
17:26 ahmed_elgabri joined #git
17:26 osse not in git terms but in human terms. for example, do you just want to pick one or the other?
17:27 aniceguy <osse> i am currently doing rebase to change the root commit. So now the rebase indicate that it need to do merging for 2nd commit as well, and there is merge conflict.
17:28 aniceguy i wanna the merge result to be exactly the same as 2nd commit.
17:28 subhojit_ joined #git
17:29 osse aniceguy: then use _ikke_'s suggestion
17:29 aniceguy you mean git checkout --theirs <file>  ??
17:30 osse yes
17:30 osse where <file> is  file.xlsm
17:30 cdg joined #git
17:30 n-st joined #git
17:32 osse ( then I think you need git add file.xlsm; git rebase --continue )
17:33 aniceguy ok. noted. thanks osse. I was about to do that now
17:35 subhojit777 joined #git
17:35 Samual joined #git
17:35 Samual joined #git
17:35 clemf joined #git
17:36 aniceguy Fantastic! I did it successfully
17:37 aniceguy Really very thank osse and _ikke_
17:37 osse \o/
17:37 aniceguy after spending almost 3/4 of the day, finally ...
17:38 _ikke_ :-)
17:38 osse aniceguy: but now you have to ask yourself: was it worth it? :P
17:38 SwiftMatt joined #git
17:38 aniceguy later i will also take a look at git-replace that _ikke_ and @gitinfo has told me earlier.
17:39 aniceguy osse: i have no choice, because the root commit contains a file that is sensitive.  so i need to update the file to remove the sensitivity
17:40 osse ah
17:40 aniceguy that's why. :)
17:40 raijin joined #git
17:41 liquidjamm joined #git
17:42 Manuel15 joined #git
17:42 Manuel15 joined #git
17:42 _ikke_ git replace you need to construct a new commit object
17:42 _ikke_ +means
17:42 ytl joined #git
17:44 aniceguy then use the new commit object to replace the initial commit?
17:44 _ikke_ yes
17:44 del joined #git
17:44 aniceguy ahm..seem like git replace is more straight forward
17:45 aniceguy if i have 6 commits in my branch, by creating a new commit object, i will end up having 7 commits in my branch?
17:45 mikeh__ joined #git
17:46 osse aniceguy: no. the command is called replace, not add :P
17:46 osse the new one replaces another
17:46 aniceguy oh...
17:46 _ikke_ Perhaps it's even easier to just replace the tree object to ommit the file
17:46 _ikke_ (+ git filter-branch to make it permanent)
17:47 aniceguy seems like there are more than 2 ways to achieve my goal
17:47 Samual joined #git
17:48 n-st joined #git
17:49 aniceguy by the way, if my root commit is shared between 2 or more branches...now i change the root commit's SHA1, will the other branches be disconnected from my current branch
17:50 subhojit_ joined #git
17:50 del left #git
17:50 osse no
17:51 _ikke_ with git replace and git filter branch, not
17:53 subhojit__ joined #git
17:54 multi_io joined #git
17:54 subhojit__ joined #git
17:54 rahtgaz joined #git
17:54 SoRoot joined #git
17:55 Faylite_ joined #git
17:55 aniceguy actually i have 2 branches, master and dev , both shared the same root commit.  yesterday, i am in master branch, trying to modify the root commit. Forgot what i do and in the end, the master and dev become disconnected
17:55 osse ah
17:55 osse wit the rebase method they become disconnected
17:56 thiago aniceguy: that's expected
17:56 osse but not if you had used replace
17:56 thiago don't modify existing commits
17:56 spacelord joined #git
17:56 aniceguy So now both the master and dev have their own root commits. Is there way to merge both root commits.
17:56 phanimahesh joined #git
17:56 thiago you should probably undo what you've done
17:56 thiago git log -g master
17:56 thiago find the commit that you had before you did the rebase
17:57 raijin joined #git
17:58 aniceguy thiago - i have no choice but to modify existing commit. Cos my commit contain sensitive data, which i need to remove
17:58 aniceguy Anyway, also take the opportunity to learn git commands in terms of modifying the existing commit
17:59 danslo_ joined #git
18:00 thiago ok, then rebase your dev branch on top of the new root commit
18:00 osse aniceguy: maybe it would be a good idea to undo the rebase like thiago said, then use git replace
18:00 thiago I hope you never merged master and dev since that root commit
18:00 osse it is the better tool for the job in this case
18:00 shinnya joined #git
18:00 thiago osse: does filter-branch make the replace permanent?
18:01 osse thiago: it used to do that back in the day with grafts, so I assume it's the case here too.
18:01 c_nick joined #git
18:01 osse ah, man page confirms it
18:02 c_nick i have a modified a file and i want to revert the changes how should i do that?
18:02 subhojit777 joined #git
18:02 osse c_nick: git status will tell you how
18:03 thiago c_nick: are the changes committed?
18:03 osse aniceguy: alternatively: go to master, find the SHA1s of the old and new root commit, then  git rebase --onto=newcommit oldcommit
18:03 osse but *either* undo rebase and replace, *or* do this. not both :P
18:04 c_nick thiago, nope .. these are just local changes
18:04 thiago c_nick: git status. It will tell you what to do.
18:05 c_nick yep, git checkout -- <file> worked
18:05 ahmed_elgabri joined #git
18:05 c_nick thanks guys .. bdw if the file is committed and u want to revert back to a certain version how to do that in git
18:05 jmd joined #git
18:05 n-st joined #git
18:06 c_nick git checkout <commit number> will work?
18:06 osse c_nick: if you add -- file after it. yes
18:06 aniceguy osse: ok let me take a look
18:06 subhojit_ joined #git
18:08 c_nick can someone assert the question asked above?
18:08 thiago c_nick: already answered
18:09 aniceguy go to master, find the SHA1s of the old and new root commit --   i now in master branch. I use git log and can see the new root commit.  U mean there is a command to let me see its old root commit SHA?
18:09 osse aniceguy: if you can see the NEW root commit in 'git log' when on master then there is no problem to begin with
18:09 thiago aniceguy: git log dev will lead you there
18:09 osse aniceguy: to be sure: dev was the one you rebased, right?
18:10 joki joined #git
18:11 c_nick why not git checkout <Commit>
18:11 c_nick instead of git rebase?
18:11 thiago c_nick: why are you talking about rebase? Your problem has nothing to do with rebasing.
18:12 bronson joined #git
18:13 cdg joined #git
18:13 c_nick yes that problem got solved now i am thinking what if i commit the file by mistake and i want to revert back to the previous version of the file.
18:13 thiago c_nick: and osse answered you
18:14 aniceguy dev root - 312e2d master root - cdbb30      so i do =>   git rebase --onto=cdbb30  312e2d
18:14 c_nick yes osse recommended git rebase i wanted to know if git checkout <commit version from git log> wont work?
18:14 thiago c_nick: osse never recommende rebase to you.
18:14 c_nick i know that i will have to do a git commit afer that
18:15 TinFury joined #git
18:15 subhojit__ joined #git
18:15 thiago c_nick: git checkout <commit> does something. It's not what you want.
18:15 aniceguy I assume git rebase --onto=cdbb30  312e2d   means rebase from 312e2d (dev)  to   cdbb30 (master)
18:16 thiago aniceguy: look at the drawing in the man page.
18:16 c_nick the reply to me was git status one
18:16 c_nick how is that different thiago can you help me on that
18:16 osse c_nick | git checkout <commit number> will work?
18:17 osse osse | c_nick: if you add -- file after it. yes
18:17 aniceguy thiago  ok i take  look
18:17 thiago c_nick: git checkout can do two things: it can update files with the content from a commit or it can switch branches
18:17 thiago c_nick: with no file paths, it switches branches
18:17 c_nick hmm ok
18:18 c_nick that makes sense thanks osse thiago
18:19 thiago the least we say about checking out from the index, the better...
18:20 netcarver joined #git
18:21 zacts_pi joined #git
18:22 mostlybadfly joined #git
18:22 osse :P
18:22 subhojit_ joined #git
18:24 aniceguy thanks! thiago and osse. now both my dev and master share the same root commit.  Hurray!
18:24 osse Success!
18:25 n-st joined #git
18:25 aniceguy 2 of my problems solved in this chat room. Really thanks very much.
18:25 t0by joined #git
18:25 osse this room = best room
18:25 _ikke_ agree :P
18:25 osse (though I think the preferred term is "channel")
18:25 aniceguy very agree.
18:26 _ikke_ osse: https://www.youtube.com/watch?v=O2rGTXHvPCQ
18:27 osse what a bunch of morons in the writer's room of that show. I should write a GUI in Visual Basic to track their IP address
18:27 aniceguy May i ask how do u define the meaning of branch in git ?
18:27 aniceguy i find the definition of branch in git  to actually mean a pointer, instead of the line of commits
18:28 osse aniceguy: you've found the correct definition.
18:28 _ikke_ aniceguy: It may both refer to a special kind of ref(erence), or all commits reachable from this reference (or commits only reachable from this reference)
18:28 _ikke_ s/special/specific/
18:28 aniceguy no wonder so confusing. Cos i come from the centralized source control such as svn, and has always assume branch is a line of commits.
18:29 osse that is git's definition. us humans though usually infer from context whether "branch" just means that commit, or whether it means that commit plus all the other ones that are not present on some main branch (typically master)
18:30 osse aniceguy: for example git log master..dev will show you all commits reachable from dev but not from master, so that kind of fits with the "human" definition
18:32 aniceguy osse: just try out git log master..dev   i think i see what u mean
18:33 nintendo3DS joined #git
18:34 InfoTest joined #git
18:36 SteffanW joined #git
18:37 alphor left #git
18:37 hahuang61 joined #git
18:40 Munt joined #git
18:42 n-st joined #git
18:44 ahmed_elgabri joined #git
18:46 jknetl joined #git
18:48 subhojit__ joined #git
18:48 magikid joined #git
18:49 subhojit__ joined #git
18:51 davisonio joined #git
18:55 subhojit__ joined #git
19:00 danslo_ joined #git
19:01 jmd Where's the git git repository?
19:01 n-st joined #git
19:02 thiago kernel.org I think
19:02 osse jmd: https://git.kernel.org/cgit/git/git.git/
19:02 osse and there's a github mirror
19:03 osse (that's a very gitty url)
19:03 mohabaks joined #git
19:03 qsx https://kernel.googlesource.com/pub/scm/git/git
19:03 SJr joined #git
19:04 osse Distributed!
19:05 _ikke_ iirc, there is no single official git.git repo
19:05 qsx there are 6 or so “official” ones
19:05 fahadash joined #git
19:05 _ikke_ Junio lists several repos in his What's cooking maisl
19:05 SJr Given two commits with a common ancestor, where commit A (feature branch) is to be merged into commit B  (main branch). What would the best way for me to get a list of all files and lines that were modified by the feature branch?
19:06 dreiss joined #git
19:06 _ikke_ The announce mails
19:06 _ikke_ git diff B...A
19:06 _ikke_ SJr: ^
19:07 SJr sorry I mean something like /path/to/file.java:596, I don't care about the actual differences, just the line numbers.
19:07 _ikke_ There is nothing built into git for that
19:08 SJr Hmmmmm so probably parsing the patch file then
19:09 _ikke_ osse: seems that vger.kernel.org is busy, mails take long to arrive
19:09 _ikke_ Altough, can imagine when it has to distribute mails to lots of people
19:10 osse SJr: if you want specific line numbers then you have to parse, I think
19:10 _ikke_ osse: https://public-inbox.org/git/_/text/help/
19:10 osse SJr: otherwise there's diff --name-only and friends
19:10 NeXTSUN joined #git
19:10 SJr Yeah and parsing the patch file is probably the most efficient?
19:10 Lucretia joined #git
19:11 osse you're the second guy who's wanted this today :P
19:11 SJr oh neat
19:11 Lucretia hi, i'm still finding my way around git and looking at the more powerful tools
19:11 Munt joined #git
19:12 subhojit_ joined #git
19:13 jmd Lucretia: Probably the most powerful one the cherry picker.
19:13 Lucretia here's what I'm wanting to do. I'm wanting to take mesa, fork it. I have done this. I've added upstream and dave airlie's repo as remotes. so, I'd like to create a branch that I update with upstream/master and also create a branch off this that contains dave's radv patches and then put up a repo on github which follows the progress but allowing me to update the tree from upstream and keep it up to date.
19:13 Lucretia jmd: yeah
19:14 jmd I hear that in the next release there's going to be git angle-grinder and git floor-sander
19:15 Lucretia not sure if I should just create a branch from dave's branch or from the upstream
19:16 Lucretia what is te correct way to do this?
19:17 nullie Lucretia: I guess Dave updates his branch from upstream
19:18 nullie If it's easy
19:18 Lucretia doesn't seem to
19:18 Lucretia he has many branches
19:18 n-st joined #git
19:18 mykespb joined #git
19:19 nullie You'd have to create branch from either and merge them both
19:19 nullie Periodically
19:21 Endarked joined #git
19:21 Lucretia so to merge in the changes, do I give merge the range of commits by id?
19:21 kulelu88 joined #git
19:22 nullie Just name of branch
19:22 nullie Or you can cherry pick commits if you don't need them all
19:23 justanotheruser joined #git
19:25 Lucretia ahh, thanks Nugget
19:25 Lucretia er nullie
19:27 mingrammer joined #git
19:28 justanotheruser joined #git
19:29 subhojit777 joined #git
19:29 mehola joined #git
19:30 ASOLAr joined #git
19:31 l4v2 joined #git
19:32 Goplat` joined #git
19:33 sangy joined #git
19:34 ahmed_elgabri joined #git
19:34 Orion3k joined #git
19:37 snfgf I have a git project with a public_html directory, hosted on a server that is also running my web server. When I push to this server I want the content to go live, which I will do my symbolic linking the public_html into my web server's document root, BUT, in my git project directory, I can't see the project folders, only branches,hooks,info,objcts,refs.
19:37 Lucretia it's a bare repo
19:38 Lucretia you cloned with --bare
19:38 grawity snfgf: that's normal; the whole point of bare repos used by servers is that they *don't* have a workdir
19:38 grawity snfgf: see !deploy
19:38 gitinfo snfgf: 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
19:38 n-st joined #git
19:39 SwiftMatt joined #git
19:41 MrWoohoo joined #git
19:41 mehola joined #git
19:42 Munt joined #git
19:43 subhojit_ joined #git
19:45 antipsychiatry joined #git
19:47 ochorocho__ joined #git
19:50 Gurkenglas joined #git
19:52 shgysk8zer0 joined #git
19:52 shgysk8zer0 joined #git
19:55 snfgf grawity, are all the events i have available in the hooks directoy?
19:56 kang00 joined #git
19:56 snfgf i have no post-push
19:56 snfgf i do have a post-update
19:56 n-st joined #git
19:57 subhojit__ joined #git
19:58 jrahmy_ joined #git
19:59 jimi_ joined #git
19:59 sssilver joined #git
19:59 osse snfgf: no, those are only some examples. all that are available are documented in man githooks
19:59 gitinfo snfgf: the githooks manpage is available at http://jk.gs/githooks.html
20:00 danslo_ joined #git
20:01 DJ_Spies joined #git
20:01 subhojit_ joined #git
20:01 cjbrambo joined #git
20:04 ProblemChild joined #git
20:04 justanotheruser joined #git
20:07 SwiftMatt joined #git
20:09 zacts joined #git
20:09 Guest86646 joined #git
20:10 zacts joined #git
20:12 ShapeShifter499 joined #git
20:14 bronson joined #git
20:15 kang00 left #git
20:15 snfgf osse, i have put in a script called post-receive and made it executable on the server
20:15 n-st joined #git
20:15 snfgf i am pushing to the server but there is no indication the script is executign
20:16 _ikke_ snfgf: add some output to it, it should show up prefixed with "remote:"
20:17 snfgf the script should be? my script is called 'post-receive' and in hooks/, and is executable, it contains an echo statement
20:19 watabou joined #git
20:20 reactormonk How would you give bisect a specific list of versions to tests? I want to run it against a github repo, and only test the PR commits
20:20 KnightsOfNi joined #git
20:21 thiago reactormonk: it won't do that for you. You'll have to.
20:21 _ikke_ git bisect is an algorithm
20:21 Rodya_ joined #git
20:21 thiago reactormonk: start the bisect, but check out the commits you want tested
20:21 ASOLAr joined #git
20:22 thiago do the good & bad
20:22 _ikke_ Why would you need bisect for that?
20:22 _ikke_ just checkout and test
20:22 mingrammer joined #git
20:22 reactormonk _ikke_, there's about 100
20:22 _ikke_ and why don't you want bisect to choose the commits
20:23 reactormonk because there's some known good points, not guaranteed to build in between.
20:23 reactormonk ... which would be an automatic skip.
20:23 ojacobson bisect expects that you can divide the graph into two continuous, non-overlapping, total subgraphs
20:24 ojacobson one of which only contains "good" commits, and one of which only contains "bad" commits
20:24 ojacobson if your problem isn't shaped like that, then you don't want bisect. you may want a shell script to loop over the candidate commits, since you know them, to check them out and test them.
20:24 reactormonk Oke.
20:24 _ikke_ yes, that's what I mean
20:25 reactormonk I figured I could give bisect a list of commits to test.
20:25 _ikke_ bisect can test 100 commits in ~7 steps, if the precondition ojacobson mentioned holds
20:25 _ikke_ No, like I said, bisect is an algorithm to quickly search a problem space
20:26 snfgf for a hook, do i name it after the event, or afater the event and with a suffix. post-receive, or post-receive.my_script.sh
20:26 _ikke_ snfgf: Just the event
20:26 _ikke_ post-receive
20:26 snfgf because my post-receive script is now working
20:26 reactormonk I could write a script that returns 127 if I don't hit one of the commits. :-)
20:27 reactormonk ehh 125
20:28 thiago snfgf: you name it exactly like the event. "post-receive" is the only allowed name.
20:29 boombatower joined #git
20:30 sssilver joined #git
20:31 davisonio joined #git
20:35 n-st joined #git
20:38 hahuang61 joined #git
20:38 Rodya_ joined #git
20:40 Noldorin joined #git
20:41 Rodya_ joined #git
20:43 Rodya_ joined #git
20:44 eijk joined #git
20:46 _ikke_ osse: Did you eventually receive your own sent mail to the mailing list?
20:46 choki joined #git
20:48 osse _ikke_: yes
20:50 zacts joined #git
20:53 kadoban joined #git
20:54 efajzioe joined #git
20:55 anttim joined #git
20:56 clemf joined #git
20:56 n-st joined #git
20:58 Darren_ joined #git
20:59 ahmed_elgabri joined #git
21:00 Torrone_1 joined #git
21:01 danslo_ joined #git
21:05 FrostCandy joined #git
21:06 NeXTSUN joined #git
21:11 tristanp joined #git
21:11 _xor joined #git
21:12 davisonio joined #git
21:13 sssilver joined #git
21:14 raijin joined #git
21:16 bronson joined #git
21:16 sostenuto joined #git
21:18 n-st joined #git
21:19 mehola joined #git
21:19 griffindy joined #git
21:20 vuoto joined #git
21:21 smoores joined #git
21:25 KnightsOfNi joined #git
21:26 mikeym joined #git
21:26 trewe joined #git
21:27 mikeym joined #git
21:27 mikeym joined #git
21:27 romerocesar_ joined #git
21:28 mikeym joined #git
21:28 cagedwisdom joined #git
21:28 mikeym joined #git
21:29 mikeym joined #git
21:30 cjbrambo joined #git
21:32 zmachine joined #git
21:32 Sc0rpius joined #git
21:33 vuoto joined #git
21:33 robotroll joined #git
21:34 nyexpress joined #git
21:34 moneylotion joined #git
21:35 mingrammer joined #git
21:37 sangy joined #git
21:39 inflames joined #git
21:41 katherine joined #git
21:43 spudowiar joined #git
21:44 n-st joined #git
21:47 nyexpress left #git
21:48 orfeo joined #git
21:48 orfeo Hello folks!
21:48 madebymarkca joined #git
21:49 orfeo I did forget to ignore a file and commit it, now I created a .gitignore file and commited again but the file which should be ignored still at my repo. How do I delete it from there?
21:50 orfeo By the way, could someone help me please?
21:50 orfeo :D
21:50 osse !ignore_tr > orfeo
21:50 gitinfo [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
21:52 orfeo osse: o/ thanks a bunch!
21:53 Darren_ joined #git
21:53 moneylotion joined #git
21:56 mehola joined #git
21:57 Spec-Chum joined #git
21:59 duderonomy joined #git
22:01 VladGh joined #git
22:02 danslo_ joined #git
22:06 docmur joined #git
22:07 docmur Is it possible when a git push / commit is done, for files to be corrupted?  I push a web development direction to my GIT Repo, for the Nth time, and all of suddent, hwne I sync it down, it can't run, as in npm run dev, produces errors.  If I move even one commit back, it's fine and if I use the exact version I pushed, it's fine, no errors
22:09 n-st joined #git
22:09 BlaXpirit docmur, what's it say?
22:12 mingrammer joined #git
22:14 docmur npm run dev is telling me moduel './_freeGlobal' can't be found, and nothing i'm doing is getting around it, but like I said the local version, the one I pushed, works fine and the all the other commits work fine
22:16 orfeo How do I fix a old fix commit coment ?
22:18 ASOLAr joined #git
22:24 beyertech joined #git
22:24 hahuang61 joined #git
22:24 BlaXpirit docmur, maybe you just didn't actually add that file to git
22:25 docmur I added everything to git, hence why I'm wondering if it's possible that it got corrupted during the push
22:28 BlaXpirit docmur, it's basically impossible
22:29 BlaXpirit orfeo, you mean commit message?
22:29 BlaXpirit first of all, keep in mind that it will recreate all commits following it, so you have to force push,  making contributors to your repository angry
22:30 dsantiag_ joined #git
22:30 hexagoxel orfeo: "old" makes me point out !rewriting; apart from that `rebase -i` and `edit` is the most direct way i know.
22:30 gitinfo orfeo: [!rewrite] 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
22:31 BlaXpirit hexagoxel, well 'reword' would be easier
22:32 BlaXpirit and  'rebase -i COMMIT~1'  to be more precise
22:32 hexagoxel right, right.
22:33 docmur Okay fair enough, I'll rack it up to freak accident, they happen
22:34 UserOO7 joined #git
22:36 beyertech joined #git
22:37 orfeo Alright, thank you.
22:37 ytl joined #git
22:37 tristanp joined #git
22:37 warthog9 joined #git
22:39 darkbit joined #git
22:40 n-st joined #git
22:40 KnightsOfNi joined #git
22:41 cjbrambo joined #git
22:43 Lyqyd joined #git
22:43 tristanp joined #git
22:46 azerus joined #git
22:47 sandstrom joined #git
22:47 mikeh__ joined #git
22:50 CheckDavid joined #git
22:52 strk joined #git
22:52 strk is there a way to ask "git diff" to show line endings in HEX form ?
22:52 strk I'm trying to debug line ending issues
22:53 clemf joined #git
22:56 BlaXpirit strk, you could show it in color... is that ok?
22:57 raijin joined #git
22:59 whomp joined #git
23:00 whomp how can i view a list of the commit messages for the previous commits that i've checked out?
23:01 snfgf Hi. I am trying to find a good workflow. I am used to working and commiting to a single master branch. I am starting my own project now, and am looking to establish a workflow. I have seen a strategy of three branches recommended; master, dev and smaller feature/topic/issue branches. These smaller branches are merged when completed, but how often should dev be merged into master?
23:01 UserOO7 joined #git
23:01 rewt whomp, there's git log, but i prefer gitk (gui) to see what happened in the history
23:01 whomp rewt, i want to see all commits i've checked out across all branches
23:01 hexa- whomp: if you like ncurses uis, try tig
23:02 rewt whomp, both of those can do that
23:02 whomp rewt, how would i do it with git log
23:02 SwiftMatt joined #git
23:02 rewt git log --all
23:02 strk BlaXpirit: colors don't reveal any differenc ein line ending
23:03 whomp rewt, this is showing me lots of commits that i haven't checked out
23:03 snfgf O_o
23:03 rewt what do you mean by checked out?  you can only checkout a branch/tag, which is a single commit
23:05 strk git log -u -R # seems to help with line endings
23:05 mizu_no_oto joined #git
23:05 raijin joined #git
23:05 l4v2 joined #git
23:08 KnightsOfNi joined #git
23:10 n-st joined #git
23:11 smoores left #git
23:11 MattMaker joined #git
23:12 Ouap joined #git
23:14 raijin joined #git
23:17 bronson joined #git
23:18 artemisart joined #git
23:18 mycyber joined #git
23:19 raijin joined #git
23:20 ASOLAr joined #git
23:23 UserOO7 joined #git
23:23 watabou_ joined #git
23:28 SwiftMatt joined #git
23:30 UserOO7 joined #git
23:32 eight58 joined #git
23:35 linuxmint joined #git
23:36 UserOO7 joined #git
23:39 n-st joined #git
23:40 UserOO7 joined #git
23:42 clemf joined #git
23:50 skylite joined #git
23:55 snfgf is there a difference between 'git checkout -b myfeature develop', and 'git checkout develop; git branch myfeature; git checkout myfeature'?

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