Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-29

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

All times shown according to UTC.

Time Nick Message
00:00 eletuch__ joined #git
00:00 izabera ah i found it
00:02 madewokherd joined #git
00:03 croberts joined #git
00:03 eletuchy joined #git
00:06 eletuchy_ joined #git
00:06 przemoc joined #git
00:08 eletuch__ joined #git
00:08 jenslarsson joined #git
00:09 sgen joined #git
00:11 tesuji joined #git
00:11 eletuchy joined #git
00:13 eletuchy_ joined #git
00:18 eletuchy joined #git
00:20 eletuch__ joined #git
00:23 peepsalot joined #git
00:23 eletuchy joined #git
00:24 mda1 joined #git
00:24 SporkWitch joined #git
00:26 bket joined #git
00:26 englishstudent joined #git
00:27 eletuchy_ joined #git
00:29 mda1 joined #git
00:30 eletuchy joined #git
00:31 jstimm joined #git
00:32 eletuch__ joined #git
00:35 eletuchy joined #git
00:35 mda1 joined #git
00:36 watabou joined #git
00:37 eletuchy_ joined #git
00:38 ochorocho__ joined #git
00:38 nettoweb joined #git
00:39 eletuch__ joined #git
00:40 mehola joined #git
00:40 livingstn joined #git
00:41 ntonjeta joined #git
00:42 eletuchy joined #git
00:42 fstd_ joined #git
00:45 eletuchy_ joined #git
00:47 eletuch__ joined #git
00:48 cagedwisdom joined #git
00:50 hahuang61 joined #git
00:51 arescorpio joined #git
00:51 eletuchy joined #git
00:54 diegoviola joined #git
00:55 eletuchy_ joined #git
00:58 mwhooker joined #git
00:58 cqi joined #git
00:58 eletuchy joined #git
01:00 eletuch__ joined #git
01:02 d4rklit3 joined #git
01:02 eletuchy_ joined #git
01:04 tarkus joined #git
01:06 eletuchy joined #git
01:11 rubyonrailed joined #git
01:13 stantonk joined #git
01:13 jimi_ joined #git
01:13 githogori joined #git
01:14 mda1 joined #git
01:17 arooni_ joined #git
01:17 User458764 joined #git
01:18 diegoviola joined #git
01:20 watabou joined #git
01:20 espindol_ joined #git
01:24 dopesong joined #git
01:24 jaguarmagenta joined #git
01:26 howdoi joined #git
01:27 mda1 joined #git
01:29 fission6 joined #git
01:30 rgrinberg joined #git
01:31 stantonk joined #git
01:36 githogori joined #git
01:39 dmto joined #git
01:46 arooni joined #git
01:46 cdesai joined #git
01:46 espindola joined #git
01:46 pks joined #git
01:46 zumba_addict joined #git
01:46 sagerdearia joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and unchanged topics | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-fetch: no training required
01:49 robdebagel joined #git
01:51 mda1 joined #git
01:51 Ariadeno joined #git
01:54 A5101 joined #git
01:55 HoierM joined #git
01:55 githogori joined #git
01:56 dmto joined #git
01:57 mda1 joined #git
01:57 Rodya_ joined #git
02:00 sagerdearia joined #git
02:02 Guest6548 joined #git
02:11 fuchstronaut joined #git
02:22 githogori_ joined #git
02:22 githogori joined #git
02:25 Goplat joined #git
02:26 opal joined #git
02:26 Rodya_ joined #git
02:30 stantonk joined #git
02:34 xaviergmail joined #git
02:35 sagerdearia joined #git
02:37 hexagoxel joined #git
02:38 arthurl joined #git
02:39 ochorocho__ joined #git
02:41 mehola joined #git
02:42 chachasmooth joined #git
02:47 mda1 joined #git
02:49 joce joined #git
02:49 lindenle joined #git
02:49 prefix joined #git
02:50 mda1 joined #git
02:51 joce hello. How do I create an alias containing double quotes on Windows?
02:51 joce e.g. git config --global alias.hist=log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short"
02:59 robdebagel joined #git
03:02 aavrug joined #git
03:03 Sasazuka joined #git
03:03 Sasazuka joined #git
03:04 mozzarella joined #git
03:04 aavrug joined #git
03:05 Sasazuka joined #git
03:08 mda1 joined #git
03:08 mwhooker joined #git
03:08 eletuchy_ joined #git
03:13 trobotham joined #git
03:16 Sucks joined #git
03:20 d4rklit3 joined #git
03:21 k3rn31 joined #git
03:21 mda1 joined #git
03:25 a3Dman_ joined #git
03:28 mozzarella joined #git
03:30 eletuchy joined #git
03:35 dreiss joined #git
03:36 mehola joined #git
03:37 tristanp_ joined #git
03:39 jaguarmagenta joined #git
03:43 stantonk joined #git
03:45 SwiftMatt joined #git
03:48 nwf joined #git
03:52 rubyonrailed joined #git
03:53 hk238 joined #git
04:00 PaulCapestany joined #git
04:00 chid joined #git
04:01 mda1 joined #git
04:02 rkazak joined #git
04:04 mda1 joined #git
04:09 nilg joined #git
04:09 fracting joined #git
04:09 mda1 joined #git
04:10 dreiss joined #git
04:11 JeDa joined #git
04:12 fuchstronaut joined #git
04:13 Lunatrius` joined #git
04:13 xaviergmail joined #git
04:16 _xor joined #git
04:18 inflames joined #git
04:21 muthu joined #git
04:22 nnyk joined #git
04:24 bb010g joined #git
04:26 eletuchy joined #git
04:27 cqi joined #git
04:31 realz joined #git
04:37 t-mart__ joined #git
04:37 Andrew_K joined #git
04:37 phanimahesh joined #git
04:38 mda1 joined #git
04:40 ochorocho__ joined #git
04:43 thiago joined #git
04:45 fracting joined #git
04:47 subhojit777 joined #git
04:48 jceb joined #git
04:48 mda1 joined #git
04:48 Jous32 joined #git
04:49 Vgr_ joined #git
04:49 mda1 joined #git
04:49 Vgr_ joined #git
04:50 ohcibi joined #git
04:51 mda1 joined #git
04:54 rubyonrailed joined #git
04:54 mda1 joined #git
04:54 rscata joined #git
04:56 k3rn31 joined #git
04:57 davidbz joined #git
04:57 quetz joined #git
04:58 ncd|leeN joined #git
05:00 Cabanossi joined #git
05:07 nilg joined #git
05:08 stantonk joined #git
05:11 the_cybersphinx joined #git
05:20 dmto joined #git
05:25 Sucks joined #git
05:25 qt-x joined #git
05:28 Sucks joined #git
05:30 Captain_Ramius joined #git
05:30 Captain_Ramius Hello, gitters!
05:30 gitinfo Captain_Ramius: 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.
05:31 opal ✡ i'd like to manually do it ג'וד
05:31 opal ✡ h ג'וד
05:31 Captain_Ramius I'm new to git and I need to make sure my git workflow matches my needs.
05:32 Raging_Hog joined #git
05:32 Captain_Ramius (not sure what that did) I'm new to git and I need to make sure my git workflow matches my needs.
05:32 opal ✡ it did nothing ג'וד
05:32 opal ✡ lol ג'וד
05:32 opal ✡ well it gave voice ג'וד
05:33 opal ✡ well what are your needs ג'וד
05:33 Captain_Ramius anyway, can you double check my git workflow?
05:33 Captain_Ramius I'm starting a project to learn php and using bitbucket (fwiw)
05:34 Captain_Ramius right now, I'm the only dev and I'm only using one computer
05:34 eletuchy joined #git
05:34 opal ✡ git's useful for making commits that you can revert later ג'וד
05:34 opal ✡ or backing up your code to bitbucket or wherever, in case you lose it ג'וד
05:35 opal ✡ i'd say go for it ג'וד
05:35 Captain_Ramius so right now I've only done "git commit -a" and "git push origin master".
05:35 ousann joined #git
05:36 Captain_Ramius I've made about 8 commits probably. is that all I need to do?
05:36 Captain_Ramius just occasionally Add and Push?
05:36 opal ✡ sounds right ג'וד
05:36 Captain_Ramius OK, good. I'm still confused on the use of Branching.
05:37 opal ✡ by the way, you can use `git push` for subsequent pushes, since the url and branch should be saved in configuration y now ג'וד
05:37 opal ✡ by☆ ג'וד
05:37 Captain_Ramius That's used if multiple devs? and you later Merge, right?
05:37 Captain_Ramius oh, leave out the "origin master" part, then. OK.
05:37 opal ✡  branches are useful when you have an "official" release and a "testing", or if you're trying to implement a new feature and you dont wanaa interfere with the rest of the code ג'וד
05:37 opal ✡ ive never need to use branches yet ג'וד
05:38 romerocesar joined #git
05:38 opal ✡ but they do become useful ג'וד
05:38 opal ✡ i cannot type for shit today ג'וד
05:38 Captain_Ramius so maybe if I get this to a useful point ("launch" if you will), then I would branch after that to protect the working version?
05:38 opal ✡ you dont necessarily need to do that ג'וד
05:39 zumba_addict joined #git
05:39 Captain_Ramius Hmmm. I'll not bother with thinking about it then. Plenty already on my mind!
05:39 opal ✡ ya ג'וד
05:39 opal ✡ you'll know when you need to use it probably ג'וד
05:39 TomyLobo joined #git
05:40 opal ✡ i would look at existing large projects on bitbucket and github to see how they organise their commits, issues, and branches ג'וד
05:40 dmto joined #git
05:40 Captain_Ramius so my git "cycle" should be: Write Code, Git Add, Git Push?
05:41 opal ✡ pretty much how it works ג'וד
05:41 Captain_Ramius Phew! One less thing to worry about. Thanks for your help.
05:41 opal ✡ np ג'וד
05:41 opal ✡ you can make multiple commits before you push ג'וד
05:42 opal ✡ say, you wanaa get rid of additional whitespace in your code for one commit, and then you wanaa fix a bug in the next ג'וד
05:42 opal ✡ that makes it easier for others to revert changes if need be ג'וד
05:42 opal ✡ since every commit has one major change ג'וד
05:42 ThomasLocke_ joined #git
05:43 shafox joined #git
05:43 opal ✡ also, if you have worked on a few files before committing anything ג'וד
05:43 opal ✡ you could do something like ג'וד
05:43 opal ✡ git add file1 file2 directory1 -m 'one edit' ג'וד
05:43 opal ✡ git add file3 -m 'another edit' ג'וד
05:43 opal ✡ git push ג'וד
05:43 lindenle joined #git
05:46 xall joined #git
05:46 zeroed joined #git
05:47 yuhlw_ joined #git
05:47 Captain_Ramius opal: cool. thanks.
05:48 Alienpruts joined #git
05:50 settermjd joined #git
05:55 diogenese joined #git
05:57 amdi_ joined #git
05:57 cdown joined #git
05:58 stuh84 joined #git
06:00 cdown_ joined #git
06:02 eletuchy_ joined #git
06:05 Rico joined #git
06:07 eletuchy joined #git
06:10 dan2k3k4 joined #git
06:10 Repox joined #git
06:10 dmto joined #git
06:10 eletuchy_ joined #git
06:11 ZenithDK joined #git
06:12 fuchstronaut joined #git
06:14 eletuchy joined #git
06:15 xall joined #git
06:16 eletuch__ joined #git
06:18 rscata joined #git
06:23 nwkj86 joined #git
06:24 freimatz joined #git
06:25 ShekharReddy joined #git
06:26 djb-irc joined #git
06:26 dminca joined #git
06:27 romerocesar joined #git
06:28 clemf joined #git
06:29 Sceorem joined #git
06:29 liranp joined #git
06:30 zumba_addict joined #git
06:32 inflames joined #git
06:32 JeroenT joined #git
06:36 rubyonrailed joined #git
06:38 djb-irc joined #git
06:41 ochorocho__ joined #git
06:41 stantonk joined #git
06:42 circ-user-7k4tY joined #git
06:45 Alienpruts joined #git
06:52 rolha joined #git
06:53 zeemz joined #git
06:53 eletuchy joined #git
06:54 Sucks joined #git
06:54 demiro joined #git
06:54 PCatinean joined #git
06:54 flaguy48 joined #git
06:58 JeroenT joined #git
06:58 nnyk joined #git
06:59 i7c What the f.
07:00 Andrew_K joined #git
07:01 shafox left #git
07:02 d0nn1e joined #git
07:05 lb opal stop misleading users
07:05 ximvan joined #git
07:05 opal ✡ LOL ג'וד
07:06 opal ✡ what the fuck am i supposed to tell them if what i said was wrong ג'וד
07:06 opal ✡ jesus christ grow up ג'וד
07:06 opal left #git
07:06 * i7c sighs.
07:07 absence i've rebased a branch on master, and i would like to move the first few commits of that branch to master, but leave the rest of the branch as it is. how do i proceed? just move the master branch pointer into the other branch?
07:07 i7c checkout master and merge the commits you want to have in master.
07:08 absence i7c: i don't want a merge commit
07:08 i7c Since you rebased it'll be fast-forward i.e. linear history.
07:08 absence but i can rebase maybe?
07:08 absence ahh
07:08 lb absence you wont have Oo
07:09 i7c absence, merge --ff-only is a good option for that.
07:09 absence so just checkout master, merge <commit-hash>, and it will move everything up to that point?
07:09 i7c It'll just refuse to do anything but fast forwards.
07:09 lb absence correct
07:09 Fijit joined #git
07:09 User458764 joined #git
07:09 absence great, thanks
07:09 lb use the --ff-only that i7c mentioned if you want to be sure that there is not merge commit
07:09 lb s/not/no
07:09 * i7c has even aliased that. Very useful indeed.
07:09 absence i see. i usually use rebase instead of merge when i want to be sure there's no merge commit. is that bad?
07:10 lb absence no it's just a different workflow
07:10 lb absence do you know about !Lol
07:10 lb !lol
07:10 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
07:11 i7c absence, in fact a rebase might be necessary to even use --ff-only because if your history is not linear, --ff-only will do nothing. It just complains.
07:11 absence i7c: i see, so it's slightly safer when you're not sure what state the tree is in
07:11 i7c absence, so rebase is the solution to the "problem", while merge --ff-only just helps you not to make "mistake"; all this in the context of enforing linear history.
07:11 absence i see, that's useful
07:12 cyan__ joined #git
07:13 absence lb: that's also useful, i normally use a gui to get that kind of overview because i don't know all these mysterious flags :)
07:13 King_Hual joined #git
07:14 absence lb: why is it called lol though? o_O
07:14 lb absence it's typically aliased as "git lol" ;)
07:14 absence haha
07:14 lb git config --global alias.lol log --oneline --graph --decorate --all
07:15 lb if i recall correctly Oo
07:15 encod3 joined #git
07:15 lb and it even works over ssh on servers or in bare repos ;)
07:16 dreiss joined #git
07:17 absence lb: very nice. needs quotes, otherwise fine: git config --global alias.lol "log --oneline --graph --decorate --all"
07:17 lb absence i for myself use this instead: alias.lg=log --graph --all --pretty=format:'%Cred%h%Creset - %C(bold red)%G?%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=short --decorate
07:17 ki0 joined #git
07:18 lb works for me ;)
07:18 Synthead joined #git
07:19 romerocesar_ joined #git
07:19 ki0 joined #git
07:21 Synthead joined #git
07:21 githogori joined #git
07:23 eletuchy joined #git
07:23 demiro joined #git
07:24 ahmedelgabri joined #git
07:27 ftoulemon hello, I'm looking for a way to display the last added files in the repository. Is there any simple solution?
07:27 ejnahc joined #git
07:28 Balliad joined #git
07:29 jast so, that guy with the funny characters recommended commands with flags that don't exist? nice
07:29 jast ftoulemon: you mean files added in recent commits?
07:30 Jellyg00se joined #git
07:30 inflames joined #git
07:31 ftoulemon jast: yes
07:31 jast git log --name-status --diff-filter=A
07:32 jast or, if you prefer, a summary of files added between commit X and Y: git diff --name-status --diff-filter=A X Y
07:32 ftoulemon jast: thank you!
07:32 jast you're welcome
07:34 xall joined #git
07:35 eijk joined #git
07:35 dmto joined #git
07:35 Andrew_K joined #git
07:36 mflow joined #git
07:37 emPi joined #git
07:37 Goffra joined #git
07:40 imjacobclark joined #git
07:41 irco joined #git
07:41 lb jast yeah i would have kicked him, if he wouldn't stopped spreading BS
07:41 lb saw it too late
07:42 JeroenT joined #git
07:45 OhDaeto joined #git
07:46 Softeisbieger joined #git
07:46 kurkale6ka joined #git
07:48 multi_io joined #git
07:49 OhDaeto joined #git
07:51 jeffreylevesque joined #git
07:52 Oebele joined #git
07:53 OhDaeto joined #git
07:54 imjacobclark joined #git
07:55 GavinMagnus joined #git
07:55 imjacobclark joined #git
07:59 OhDaeto joined #git
08:01 ZenithDK joined #git
08:01 _pix joined #git
08:03 fees joined #git
08:03 mariuscc joined #git
08:05 Darcidride joined #git
08:06 demiro joined #git
08:06 nnyk joined #git
08:07 rscata joined #git
08:08 MrMojito joined #git
08:08 MrMojito joined #git
08:10 t0by joined #git
08:11 clmsy joined #git
08:11 marcogmonteiro joined #git
08:13 fuchstronaut joined #git
08:14 cdown joined #git
08:14 cdown joined #git
08:15 Rico joined #git
08:18 Sazhen86 joined #git
08:18 eletuchy joined #git
08:26 weckl joined #git
08:26 FunkyAss joined #git
08:26 weckl joined #git
08:26 OhDaeto left #git
08:26 rolha joined #git
08:27 weckl joined #git
08:28 weckl joined #git
08:28 weckl joined #git
08:28 dreiss joined #git
08:29 weckl joined #git
08:29 weckl joined #git
08:30 weckl joined #git
08:31 troulouliou_div2 joined #git
08:31 weckl joined #git
08:32 mikecmpbll joined #git
08:32 weckl joined #git
08:34 jknetl joined #git
08:36 jatin30 joined #git
08:36 rjvb joined #git
08:37 jatin30 Hi I got this error can someone help? https://bpaste.net/show/cac2c9869c4e
08:37 kwizart left #git
08:37 GT joined #git
08:39 i7c Someone pushed to your remote while you were working locally. You have to either merge or rebase your stuff before you can push.
08:39 i7c It already suggests "git pull" there which will (in default configuration) cause git to merge the remote and your branch.
08:41 rjvb hello
08:41 ochorocho__ joined #git
08:41 rjvb I have a question about "sign" trailers
08:42 rjvb I need to have one set up in my ~/.gitconfig
08:42 rjvb is it possible to add some magic that makes it easier to override (cancel) it in specific repositories?
08:43 rjvb currently the only way I found is to add an overriding [trailer "sign"] section to the corresponding .git/config files, or else to remove the hooks/commit.msg file
08:43 rjvb both are operations that are too easy to forget
08:43 jatin30 i7c, so should I run "git pull" now?
08:43 stantonk joined #git
08:45 link0802 joined #git
08:47 rmrrn joined #git
08:47 rmrrn joined #git
08:47 link0802 joined #git
08:47 sondr3 joined #git
08:48 lindenle joined #git
08:48 link0802 joined #git
08:49 link0802 joined #git
08:49 absence i have a commit where a file has been deleted and added with a new name and very minor changes. it's obvious to me that it's a rename, but show -C doesn't detect it for some reason. is it possible to force it by amending the commit?
08:50 link0802 joined #git
08:50 link0802 joined #git
08:51 jast git doesn't store information about what was renamed and what wasn't. any time you see git showing a rename, it's detected on the fly
08:53 Lachezar joined #git
08:53 jast try passing -C a parameter, e.g. -C90, to make the detection more trigger-happy
08:54 jast no wait, that's not the right syntax
08:54 Lachezar Hey Hey! How do I create a patch for off-line sending to a colleague that contains changes in a branch from where it split from the master?
08:54 jast the default is -M50% = -M5. try -M4 or -M3.
08:55 jast Lachezar: depends. the standard approach creates a single patch for each commit (optionally all of them can be stuffed in a single file). would you prefer that, or a single diff?
08:56 absence jast: actually -Cnum worked, i just had to use a much lower number as there were way more changes than expected (damn auto code reformatter). thanks!
08:57 Lachezar jast: Hm… Proper question, one allows to re-create the branch right? The other would create a branch with one commit only. Is there any git way for sending change-sets off-line?
08:57 Lachezar jast: I'd probably want the branch (all commits, logs, etc.) similar to 'push'?
08:58 jast Lachezar: the standard way is git format-patch, which creates one file per commit (and the whole bunch can be sent as individual e-mails using 'git send-email'. format patch makes it contain all the metadata and the changes.
08:58 retropikzel joined #git
08:59 jast example: git format-patch master..mybranch
08:59 jast alternatively you can create a git bundle file which people can use to 'git fetch/pull' from
09:00 jast that's a binary format, though
09:00 jast see man git-format-patch, man git-bundle
09:00 gitinfo the git-format-patch manpage is available at http://jk.gs/git-format-patch.html
09:00 gitinfo the git-bundle manpage is available at http://jk.gs/git-bundle.html
09:00 clmsy joined #git
09:01 diogenese joined #git
09:01 Lachezar jast: Binary works. My colleague has the git repository, but I'm off to vacation, and want to send him the changes so that we can simulate push-pull.
09:04 mrkat joined #git
09:06 jatin30 i7c, I did git pull <url of remote> , it was successfull but when I did git push it gave me the same error again
09:07 jatin30 i7c, have a look at this please https://bpaste.net/show/a3994f1b8f89
09:07 jagob joined #git
09:12 eletuchy joined #git
09:14 i7c jatin30, you're trying to push a specific commit by id there.
09:14 i7c jatin30, after the merge you have a new merge commit tho, this is what you should be pushing now.
09:15 Lachezar jast: 'git bundle create whatever.bundle master...whatever' creates the bundle, but how do I apply it to an existing repository? 'git bundle unbundle whatever.bundle' has no effect.
09:16 playfullyExist joined #git
09:16 zumba_addict joined #git
09:19 Kurvivor joined #git
09:19 Lachezar jast: 'git remote add bundle whatever.bundle; git fetch bundle; git merge bundle/whatever; gir remote remove bundle'?
09:20 Lachezar s/gir/git/
09:20 Kurvivor hello! i need an advice on local history changing
09:20 Kurvivor i have the following situation: several development branches, that are all sequentially merged into main. One branch starts after previous is merged
09:22 yude joined #git
09:22 Kurvivor i have added some commit to the first of those branches. How do i properly propagate it down the line? That is, make it so that development branch is merged to main one in its new end instead, and other development branches start from there as well?
09:23 sdothum joined #git
09:24 keltvek joined #git
09:24 diogenese joined #git
09:24 Darcidride joined #git
09:24 Kurvivor i suppose i can reformulate it as "how to rebase a number of branches based on each other"?
09:24 mischat joined #git
09:24 mozzarella joined #git
09:25 mischat joined #git
09:26 Lachezar jast: 'git remote add bundle whatever.bundle; git fetch bundle; git checkout whatever; git remote remove bundle' <-- WORKS!
09:26 romerocesar joined #git
09:27 jast sorry, I was busy. happy to hear you figured it out.
09:27 Lachezar ++jast
09:28 jast prefix increment operator? are you trying to be extra special? ;)
09:29 t0by joined #git
09:29 jast ... and I just realized that the bot's code for parsing karma is fairly stupid
09:32 eletuchy joined #git
09:33 zumba_ad_ joined #git
09:34 Seveas ++jast++
09:34 jast it ignores prefixes
09:34 Seveas so stupidjast++ works too?
09:36 garethdaine joined #git
09:36 realz joined #git
09:36 hahuang65 joined #git
09:37 jast nope
09:37 jast matches on word boundaries only
09:38 dsdeiz joined #git
09:38 dsdeiz joined #git
09:39 jaguarmagenta joined #git
09:42 mariuscc joined #git
09:45 Kicer86 joined #git
09:46 JeroenT joined #git
09:47 ahr3n joined #git
09:48 wrouesnel joined #git
09:50 JeroenT joined #git
09:52 JeroenT joined #git
09:54 Lachezar jast: So no karma?
09:54 Silenced joined #git
09:55 Lachezar jast: I'm fairly unfamiliar with karma bots. I _vaguely_ remember, that this was the way to do it in #java
09:55 User458764 joined #git
09:56 jast karma is really just a toy here, at least for me
09:57 Lachezar jast: Isn't it everywhere?
09:57 jast as evidenced by some of the bot's smart remarks...
09:57 jast gitinfo++
09:57 gitinfo jast: as a bot, I live on a higher plane of existence than you do. Karma has no meaning here.
09:57 Lachezar ~jast ++
09:57 Lachezar Nope still wrong. *sigh*
09:57 jast you don't get a confirmation from the bot when karma goes through, anyway
09:57 Lachezar ~jast++
09:57 jast that one probably worked
09:58 Lachezar jast: Oh, In #java you get to know the users' karma after modifying it.
09:58 jast anyway, the bot understands 'thanks' and a bunch of other things, too
09:58 Lachezar Thanks jast
09:58 jast stop unduly manipulating the karma, it's serious business! :P
09:59 jast you can query people's karma, but the visible values update very slowly
09:59 jast .karma jast
09:59 gitinfo the Genuine Real Life Karma™ REST API results are back! j‍ast: 87 (1 in past 30 days) (2 given out)
09:59 Lachezar No feed-back is a serious business :)
09:59 jast ... meeting ahead... laters
10:00 Lachezar Bye…
10:00 davisonio joined #git
10:01 freimatz joined #git
10:06 PCatinean joined #git
10:08 Beams joined #git
10:08 tvw joined #git
10:08 eletuchy joined #git
10:09 PCatinean joined #git
10:11 User458764 joined #git
10:13 Beams Currently learning git. Just did "git remote add abc http://github.com/abc && git fetch abc". It looks like abc/master has automatically been merged into my master. Is that correct, and how do I undo it? Thanks.
10:13 jast that is most definitely not correct
10:13 jast can you paste the output you got, and/or anything else that indicates to you that it got auto-merged? (!paste)
10:13 gitinfo Please use a pastebin for snippers longer than one line. https://gist.github.com and https://vomitb.in both work well.
10:14 jast grr, who broke the spelling in that one...
10:14 fuchstronaut joined #git
10:14 jast .trigger_edit paste Please use a pastebin for snippets longer than one line. https://gist.github.com and https://vomitb.in both work well.
10:14 gitinfo jast: Okay.
10:15 notebox joined #git
10:16 t0by joined #git
10:16 Impaloo joined #git
10:18 Beams jast: Thanks, I had misunderstood what was happening. Think I've got it now having reread my history
10:20 cdown joined #git
10:21 jast okay, great
10:22 raijin joined #git
10:22 abk joined #git
10:24 fuchstronaut joined #git
10:25 demiro joined #git
10:25 Silenced joined #git
10:30 jatin30_ joined #git
10:39 jatin30_ joined #git
10:40 jatin30_ joined #git
10:42 DieguezZ joined #git
10:42 ochorocho__ joined #git
10:45 WayToDoor joined #git
10:45 stantonk joined #git
10:46 JeroenT joined #git
10:46 jatin30 can someone explain the error https://bpaste.net/show/40ec3a6dac3b ?
10:47 mariuscc joined #git
10:47 sondr3 joined #git
10:49 _ikke_ jatin30: You need to specify a remote, not a remote tracking branch
10:49 _ikke_ git pull <remote> <branch>
10:49 cdown joined #git
10:50 jatin30 _ikke_, i did that only earlier and it gave this https://bpaste.net/show/4f3ff25c3388
10:50 lindenle joined #git
10:51 _ikke_ git pull --rebase fpro pango-1-0
10:52 JeroenT joined #git
10:53 r_s_o joined #git
10:53 nilg` joined #git
10:54 jatin30 _ikke_, thanks it worked! so the format is basically git pull --rebase <remoteName> <remoteBranchName> right?
10:54 r_s_o Hey, is it possible for me to clone submodules with my github username/password in the commands?
10:55 r_s_o so something like "git submodule update --init user/password"
10:55 jatin30 _ikke_, i got some merge conflicts tho
10:55 ZenithDK left #git
10:55 JeroenT joined #git
10:56 joce joined #git
10:59 _ikke_ jatin30: yes
11:00 johnmilton joined #git
11:02 eletuchy joined #git
11:03 notebox joined #git
11:06 JeroenT joined #git
11:07 ahmedelgabri joined #git
11:07 nnyk_ joined #git
11:07 vivekp joined #git
11:09 rchavik joined #git
11:14 JeroenT joined #git
11:14 hahuang65 joined #git
11:15 ojdo joined #git
11:15 fission6 joined #git
11:16 lpapp joined #git
11:17 rnsanchez joined #git
11:17 lpapp hi, is there something like git tag --contains that works for cherry-picks?
11:17 lpapp i.e. providing the hash means it looks for identical commits
11:18 dsdeiz_ joined #git
11:18 lpapp rather than literal hash match... otherwise, it is pretty difficult to see in which releases a commit went into when release managers cherry-pick forth and back.
11:19 i7c git cherry?
11:19 nettoweb joined #git
11:20 HoierM joined #git
11:21 Silenced joined #git
11:21 Silenced joined #git
11:22 _ikke_ yeah, git cherry indeed
11:22 lpapp i7c: is that a reply to me or someone else? It does not seem relevant, hence asking.
11:22 t0by joined #git
11:23 i7c git cherry does what you want, I suppose. :)
11:23 cdown joined #git
11:23 lpapp no, it does not.
11:23 i7c Oh it doesn't?
11:23 lpapp https://paste.kde.org/ppywhgkdo/a18pkw/raw
11:23 lpapp this is not what I was after
11:23 lpapp I was after releases (i.e. tags) in which a commit occurs.
11:24 lpapp even if the commit is just cherry-picked into a different release branch.
11:24 i7c Ah, oh.
11:24 lpapp so I wish to have an output which is the same as that of git tag --contains hash's
11:25 i7c I'm not aware of a way. That would imply you'd need to compare your commit to all others pretty much?
11:25 lpapp but then again, that does not seem to track cherry-picks
11:25 lpapp I guess a --cherry or some option would be nice to have for --contains
11:25 lpapp --contains-all
11:25 lpapp --contains-follow or something
11:25 lpapp i7c: that is right, if git does not record cherry-picks.
11:26 Macaveli joined #git
11:26 lpapp I mean it is a common task in our projects: we wish to see which releases a change went into
11:26 lpapp sometimes it is extremely necessary and cherry-picks happen across branches, for instance, from master to a release branch, etc.
11:27 lpapp so just like git log --follow is useful at times, I would like to have something like --contains-follow
11:28 i7c log --follow is easy to implement efficiently. What you want is probably not which might be a reason that the feature does not exist, if it does not exist. I do not know. :)
11:29 lpapp why is it not easy to implement --contains-follow?
11:29 lpapp 1) It does not have to be efficient, right?
11:29 i7c Well yeah it's simple but not efficient to run.
11:29 lpapp 2) You bail out at the first non-matching character of a commit and that is 99% of the case that you bail out instantly.
11:30 lpapp I bet 99.9% would not go over the subject line.
11:31 Felishia joined #git
11:31 Felishia help
11:31 Felishia how do I remove a commit from git I pushed?
11:31 Felishia to a branch
11:31 _ikke_ !fixup
11:31 gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
11:31 Felishia not to master
11:32 lpapp i7c: has anyone brought up the idea before on the git developer mailing list?
11:32 lpapp not that I will, but just out of curiosity.
11:32 berndj joined #git
11:32 i7c Good question. I don't read all the mails there just due to severe lack of time.
11:33 i7c lpapp, but feel free to bring it up. They tend to be nice there. :p
11:33 barteks2x joined #git
11:33 EvilDMP Hi - when I have a "This branch is out-of-date with the base branch. Merge the latest changes from develop into this branch." option on GitHub, what will that leave in the logs? I'm guessing it will do as it says and leave a merge commit.
11:34 lpapp i7c: I do not have time either, sadly.
11:34 lpapp cheers though.
11:34 i7c lpapp, it shouldn't be that hard to script the algorithm using the git tools you have available tho?
11:34 raijin joined #git
11:35 i7c EvilDMP, depends. If both branches moved on since the branching, yes.
11:35 Felishia I don't know
11:36 Felishia I wrote and pushed something stupid ina  commit
11:36 basiclaser joined #git
11:36 EvilDMP thank you i7c
11:36 Felishia I need to rewrite it
11:36 Felishia D:
11:36 Felishia I'm awful at git
11:36 i7c EvilDMP, but yeah since it mentions that the base branch moved on, it will lead to a merge commit.
11:36 lpapp i7c: no, but still, I am probably not the only one interested in this.
11:36 bin4ry joined #git
11:36 Felishia can I just remove the branch?
11:37 i7c EvilDMP, otherwise nothing would happen because your branch would contain the entire base branch.
11:37 EvilDMP cheers i7c
11:37 lpapp i7c: let me know if you have a better to workflow in mind to avoid this issue 100%.
11:37 MadHatter42 joined #git
11:37 lpapp one could always record cherry-picks explicitly, but humans got computers to automate things.
11:38 ToBeCloud joined #git
11:38 netcarver joined #git
11:38 i7c lpapp, if you rely more on merging than cherry-picking it gets easier maybe?
11:38 i7c But not idea what your project requires.
11:38 RedShift joined #git
11:39 lpapp i7c: yeah, we maintain old releases with bugfixes released.
11:39 i7c Basically you have more of a wild patch collection than a mainline with branches. ;)
11:39 lpapp so we only cherry-pick the most critical things from master.
11:39 Felishia help I pushed the security keys
11:39 lpapp we cannot merge all from there.
11:39 i7c I see.
11:40 i7c Felishia, you can remove a remote branch by doing git push <remote> :<branchname>
11:40 i7c i.e. git push origin :myevilbranch
11:40 jaguarmagenta joined #git
11:40 i7c Felishia, you can remove a commit remotely by reset --hard HEAD~ and then push with --force-with-lease
11:41 retropikzel joined #git
11:41 i7c lpapp, I think there was a discussion here, similar to this.
11:42 lpapp i7c: I ought to send this idea to git@vger.kernel.org ?
11:42 i7c lpapp, I think one proposal was to put some kind of key in the commit messages.
11:42 i7c And then use log -S
11:42 lpapp uh, nasty and dirty :)
11:42 i7c :)
11:42 lpapp of course, -S looks for even the commit content itself.
11:42 lpapp so you could get lots of false positives.
11:42 i7c And yes, that's the ML’s address.
11:43 jimi_ joined #git
11:43 i7c lpapp, uh --grep
11:43 i7c My bad.
11:43 i7c -S would be awful indeed. :D
11:44 Felishia i7c, will that remove the logs?
11:44 Felishia I need to remove the logs because the private keys are there
11:44 Felishia and I can't get new ones D:
11:44 Felishia none has noticed
11:44 i7c Felishia, did you add them in the most recent commit you made?
11:44 Felishia yes
11:45 Felishia i7c, it doesn't matter if I lose some data
11:45 Felishia I have a backup I can recommit
11:45 cbreak Felishia: you can not remove data from git easily
11:45 cbreak once you've pushed, it's out of your hands
11:45 Felishia cbreak, D:
11:45 Felishia it's in a branch
11:45 cbreak even if you have force push rights, the server might have reflog, or an other log
11:45 i7c Deleting the branch will "obscure" it.
11:45 cbreak Felishia: of course it is
11:46 Felishia I have all the rights
11:46 cbreak can you ssh to the server?
11:46 Felishia I'm disablign the reflogs
11:46 Felishia no
11:46 Felishia it's in bitbucket
11:46 cbreak then you lack the rights
11:46 absk007 joined #git
11:46 Felishia I mean I have all the git rights
11:46 i7c Felishia, why can't you get new keys?
11:46 i7c I'd rather work on that to be safe. :p
11:46 Felishia because then I have to ask management... >.>
11:46 Felishia and they'll get pretty mad at me
11:46 Felishia no...
11:47 imjacobclark joined #git
11:47 Felishia none of them has seen them
11:47 i7c You should tell them better be mad now than hiding a possible security breach.
11:47 Felishia it's no problem since it was a line out of 1000 where I copied paste mistakely
11:47 Felishia no
11:47 Felishia just help me remove it
11:47 Felishia D:
11:47 lpapp i7c: Delivery to the following recipient failed permanently:
11:47 lpapp git@vger.kernel.org
11:48 lpapp i7c: resent, hope it is there now...
11:48 martinkl_ joined #git
11:48 cbreak Felishia: git push -f remotename commityouwanttohavethere:branchname
11:49 cbreak Felishia: but that will not delete the commit
11:49 cbreak it'll just make it unreachable by normal means
11:49 cbreak Felishia: you are foolish if you think this is enough.
11:49 Felishia cbreak, it doesn't matter
11:49 cbreak everyone else that fetched it has the history
11:49 Felishia as long as they can't see it in the bitbucket logs
11:49 cbreak everyone that has access to the repository can get the history
11:49 i7c And you should probably do git reset --soft HEAD~  locally because otherwise you'll just push it again next time. :D
11:49 cbreak yes. Or commit --amend
11:50 i7c And then unstage the darn keys.
11:50 cbreak or rebase -i
11:50 i7c yeah
11:50 Felishia can I amend the last commit?
11:50 cbreak remove the key from the repository
11:50 Felishia it was just one line
11:50 i7c Felishia, yes.
11:50 i7c Remove it, add the file and do git commit --amend
11:50 freimatz joined #git
11:50 Felishia wait how do I do it?
11:50 Felishia it's one line...
11:50 cbreak edit the file to be as you want it to be
11:50 cbreak git add the file
11:50 cbreak git commit --amend
11:50 i7c git push -f the branch
11:50 cbreak better: remove the whole file
11:51 cbreak and add it to gitignore
11:51 i7c lpapp: it's there: http://www.mail-archive.com/git​@vger.kernel.org/msg97355.html
11:51 Felishia I said it I pasted it in a file by mistake
11:51 Felishia okay can you explain
11:51 Felishia the file is language.json
11:52 Felishia I change the line
11:52 rkazak joined #git
11:52 Felishia then do git commit --ammend
11:52 Felishia git push -f mybranch
11:52 i7c amend with one m :)
11:52 i7c And yes.
11:53 cbreak Felishia: don't forget to stage the change first
11:53 cbreak before committing
11:53 lpapp i7c: cheers, should have reread it before sending to avoid grammar issues :)
11:53 eatsfoobars joined #git
11:53 i7c lpapp, "issues" :D
11:54 Felishia http://pastie.org/10894108 cbreak
11:54 yushyin joined #git
11:54 Felishia that's the current status... I already modifed
11:54 i7c git addd
11:54 Felishia the broken file
11:54 i7c -d
11:54 lpapp left #git
11:54 Felishia git add?
11:54 cbreak as I said above: add the file
11:54 cbreak to stage it
11:54 i7c git add _lang/lang/language.json
11:54 cbreak you're new to git?
11:54 ozette joined #git
11:54 Felishia cbreak, more or less
11:55 cbreak this is what you normally do when committing
11:55 cbreak git add the changes
11:55 Felishia otherwise I wouldn't need help
11:55 i7c you can also use git add -i which is more convenient sometimes. Or git add -p for that matter.
11:55 Felishia yeah but I want to avoid people seeing that I uploaded the damn key in the last commit
11:56 absence let's say i have a branch A from the tip of master, then i amend the most recent commit on master. if i want to include this change in the A branch, i thought i'd checkout A and rebase master, but it seems to want to apply the old version of the most recent commit on master on top of the amended one. if i rebase -i master, i can manually remove it, but is there a better way?
11:56 eletuchy joined #git
11:56 Noldorin joined #git
11:59 phanimahesh joined #git
11:59 cbreak Felishia: the only difference in what you have to do differently is to git commit --amend
11:59 i7c Felishia, as cbreak mentioned several times, it will become non-obvious that you fucked up by commit --amend und force push. There is really nothing left to say.
11:59 cbreak and not git commit
11:59 cbreak amend will change the most recent commit
11:59 liquidjamm joined #git
12:00 Felishia cbreak, sorry OMG
12:01 Felishia okay I did git commit ammend
12:01 Felishia git commit --amend
12:01 Felishia right
12:03 tomog999 joined #git
12:03 Felishia so now I take my commit id?
12:04 Felishia help D:
12:04 Felishia I already added
12:04 Felishia git add --all
12:04 Felishia git commit --amend
12:04 rkazak joined #git
12:04 i7c Now you push -f
12:04 cbreak look at your commit
12:04 cbreak is it as you want it?
12:04 Felishia git push -f origin COMMIT_ID:testing
12:04 cbreak git show shows the changes in the commit
12:05 cbreak you can leave away the commit_id: part if it is the current commit
12:06 synthroid joined #git
12:06 Felishia yay now it seems invisible
12:07 ntonjeta joined #git
12:07 absence http://pastebin.com/arq6UsWt <- here's a diagram of my situation
12:07 ahmedelgabri joined #git
12:07 Felishia how can I make sure it is?
12:07 Felishia I mean now in the commmit history it seems like that didn't happen
12:08 Felishia when I merge with master that won't appear right?
12:08 Sceorem joined #git
12:08 Felishia none really checks my branch... but they do master...
12:10 espindola joined #git
12:10 cbreak absence: what git does when you rebase is to apply the changse
12:11 cbreak when you apply C1' changes, it will see that the new C1' contains some of the changes (presumably), but some of them aren't there, or there are other changes, but something causes it to think that the old C1 isn't applied completely, so it creates a new C1*, which contains those
12:11 cbreak this is normal
12:12 cbreak absence: if you want to drop C1 completely, either use a ranged cherry-pic, use rebase-i as you said above, or use rebase with a custom merge base
12:13 absence how would the rebase with custom base look? sounds like what i want
12:14 circ-user-3IYjF joined #git
12:14 absence cbreak: the combination of C1' and C1 can only ever result in trouble, either as a merge conflict if i'm lucky, or silently undoing the changes in C1' if i'm unlucky :)
12:14 cbreak git rebase --onto master C1
12:15 cbreak something like that
12:15 absence cbreak: that will drop C1?
12:15 i7c It doesn't get prettier tho. :p In any case you will have to think and git won't magically resolve it for you.
12:16 cbreak absence: effectively
12:16 cbreak absence: it will take everything that is reachable from your current branch, but not from C1
12:16 hk238 joined #git
12:16 cbreak C1 is reachable from itself, so it will not be rebased
12:17 cbreak similar to git cherry-pick C1..branchna
12:17 happy-dude joined #git
12:17 jeffreylevesque joined #git
12:17 Rooxo joined #git
12:18 Felishia oh crap
12:19 Felishia what happens if you incidentally run git push -f on master?
12:19 i7c cbreak, does a cherry-pick make much sense? He would need to reset to the new master and then cherry-pick them again?
12:20 cbreak i7c: depends
12:20 cbreak if he wants to merge into master after the rebase, then sure
12:20 cbreak he can also make a new branch to pick into
12:20 ToxicFrog Felishia: the remote is updated to exactly match whatever master is in your local repo
12:20 i7c yeah
12:20 cbreak Felishia: then you rewrote master history
12:20 cbreak to what ever you pushed
12:20 Felishia WTF
12:20 i7c Just seems more work than rebase -i and drop a commit
12:20 cbreak effectively killing all history that was there
12:20 i7c or rebase with --onto
12:20 sasha- left #git
12:20 Felishia WTF
12:20 ToxicFrog Felishia: you can recover any "lost" commits via the reflog, though, nothing has actually been deleted
12:21 Felishia I just mistakenly run that
12:21 ToxicFrog (and by default won't be for at least a month)
12:21 cbreak Felishia: you can fix it by force pushing what was there before
12:21 Felishia and I see that my branch is now 78 commits ahead
12:21 Felishia which makes no sense
12:21 Felishia and what was there before?
12:21 Stummi Felishia, did you force-push an older commit?
12:21 cbreak git push should have told you
12:21 nettoweb joined #git
12:21 Felishia Stummi, apparently 3 months old
12:21 Felishia no it didn't I actually ran it by mistake
12:22 Felishia when I was doing this
12:22 Felishia but my branch is supposed to be merged with master
12:22 Felishia the one I just fixed
12:22 cbreak fix master first...
12:22 Felishia has all the history because it was exactly two commits ahead
12:22 cbreak push the commit it should have
12:23 cbreak git push origin commititshouldhave:master
12:23 Felishia how? I don't have a copy of master?
12:23 cbreak use the hash
12:23 cbreak or use origin/master
12:23 cbreak (your remote tracking branch)
12:23 WayToDoor joined #git
12:23 cbreak as I said above, git push should have told you the hash
12:23 Felishia oh I didn't grab it D:
12:23 cbreak something like 161c9dd..268297f  master -> master
12:24 cbreak Felishia: just scroll up
12:24 Felishia I was confused because I thought I was working in my branch
12:24 cbreak the left number is the old one, the place you want to go to
12:24 Felishia I ran a lot of git commands it's gone
12:24 cbreak ...
12:24 fuchstronaut joined #git
12:24 cbreak get more ram
12:24 cbreak history buffer is very valuable :)
12:24 Felishia I have 1GB
12:25 Felishia :(
12:25 Felishia so now I messed up master without noticing
12:25 Felishia I need to fix it, this is worse than the keys
12:26 i7c you just ran 'git push -f master'?
12:26 demiro joined #git
12:26 i7c Or what was the exact command.
12:26 Felishia no I ran git push -f
12:26 Felishia thinking to apply that to my own branch a while ago
12:26 fuchstronaut joined #git
12:26 Felishia but it applied it to master
12:26 i7c While master was checked out?
12:26 Felishia I wasn't in master
12:26 i7c I don't see a problem then.
12:27 Felishia well it affected master
12:27 i7c Unless your upstream branch was configured to be master which it probably wasn't.
12:27 Felishia it wasn't
12:27 Felishia but it did it
12:27 Felishia It rewrote master history
12:27 cbreak Felishia: if your git is old, it'll push all branches
12:27 cbreak Felishia: just do what I told you above
12:27 Felishia it only did to master
12:27 i7c How do you know that?
12:27 Felishia git push origin commititshouldhave:master ?
12:28 cbreak yes...
12:28 Felishia how would I know what was the commit? D:
12:28 Felishia I got the commit id of the last merge of my branch though
12:28 i7c I don't even see how you notice that master was rewritten. :P
12:28 rahtgaz joined #git
12:28 i7c Obviously you don't interpret git’s output much.
12:28 xpk joined #git
12:29 martinkl_ joined #git
12:29 i7c So until we're certain that there is a problem, I'll grab some coffee.
12:29 Felishia I am
12:29 absence hm, when i'm on a branch A and do pull --rebase, that's a combination of fetch and some kind of rebase command. how does that rebase command look?
12:29 Felishia I just checked master on bitbucket
12:30 Felishia the repo seems like it was last commit updated 3 months ago
12:30 Felishia but we updated it this morning
12:30 Guest6548 joined #git
12:30 Felishia the readme changed as well to the old one
12:30 i7c Felishia, how about your local master branch. Would that be the correct one?
12:30 cbreak absence: git rebase @{u}
12:30 Felishia that's incorrect
12:30 cbreak I think
12:31 Felishia I haven't updated local master branch since 3 months ago
12:31 i7c You haven't fetched for 3 months
12:31 i7c ?
12:31 cbreak Felishia: go find the right hash
12:31 i7c Then you're doomed anyways.
12:31 Felishia i7c, no
12:31 cbreak do you have that commit in history?
12:31 Felishia wait I do
12:31 cbreak then do what I told you
12:31 i7c How is that even possible. :D
12:31 cbreak i7c: ancient git
12:32 i7c You don't fetch and stuff just magically pops up?
12:32 cbreak i7c: git config push.defaults matching
12:32 i7c Okay that I can see, and thank god they changed that. :p
12:32 cbreak i7c: I think the origin/master on that repo is correct, but not the master
12:32 cbreak but since I already told Felishia to check that, I don't have to repeat that again
12:32 i7c And a force push wouldn't update origin/master in that ancient git?
12:33 cbreak hmm...
12:33 cbreak that's a good question
12:33 cbreak maybe
12:33 davisonio joined #git
12:33 cbreak anyway, this shows again how good it is to work with a proper terminal
12:33 cbreak one with lots of scrollback buffer
12:33 * i7c nods.
12:34 Felishia accoridng to public logs it's 4c61622
12:34 moritz and with non-ancient versions of git :-)
12:34 cbreak Felishia: well, check it. git log 4c6...
12:34 cbreak if it's what you want, push it
12:34 Felishia where in master?
12:34 gordonjcp joined #git
12:34 gordonjcp hi
12:34 JeroenT joined #git
12:34 moritz hello gordonjcp
12:34 gordonjcp moritz: afternoon
12:35 moritz it's always morning in Universal Greeting Time (UGT)! :-)
12:35 gordonjcp :-D
12:35 gordonjcp it's just after lunchtime for me :-)
12:35 jast !ugt
12:35 gitinfo UGT (Universal Greeting Time): it is always morning when someone joins a channel, and always late night when they leave. http://www.total-knowledge.com/~ilya/mips/ugt.html
12:35 gordonjcp I'd like to do something I think might be moderately difficult with git; what I want to do is fork a repository and rearrange how all the files are laid out
12:35 i7c Felishia, *sigh*. Read please. Do git log 4c61622 and see if that's the correct commit, if it is, push 4c61622:master
12:36 gordonjcp say I have thing.c, and I move it to stuff/thing.c - when I pull from the upstream repo, will it be able to work out that I've moved the file?
12:36 xaviergmail joined #git
12:36 JeroenT joined #git
12:36 jast gordonjcp: typically, yes. if you don't change the contents *and* move in the same commit, it's pretty easy for git to recognize the rename. new files, however, are a different story.
12:37 cbreak gordonjcp: if you committed the change
12:37 moritz gordonjcp: yes, if you don't change the file too much
12:37 jast git won't be able to automatically figure out they're supposed to go to a different place in your layout
12:37 gordonjcp okay
12:37 gordonjcp so if I move thing.c to stuff/thing.c and commit "make tidy source dirs"
12:38 gordonjcp then edit stuff/thing.c a bit and commit
12:38 t0by joined #git
12:38 gordonjcp it might not work out that upstream changes need to go to stuff/thing.c?
12:38 Felishia i7c, it works :D wait, I think someone else did it, I haven't done anything... >.> damn someone already noticed
12:39 gordonjcp that being said, the upstream package is updated very infrequently
12:39 gordonjcp if I have to take special care every six months to a year, I can live with that
12:41 chuertab joined #git
12:43 ochorocho__ joined #git
12:45 ahmedelgabri joined #git
12:46 fission6 joined #git
12:47 tonyj joined #git
12:50 cqi joined #git
12:50 fission6 joined #git
12:51 eletuchy joined #git
12:51 raijin joined #git
12:52 lindenle joined #git
12:52 muthu_ joined #git
12:53 muthu_ joined #git
12:55 sentriz joined #git
12:55 flaguy48 left #git
12:56 rgrinberg joined #git
12:58 nivag joined #git
13:02 candelabra joined #git
13:02 piattino joined #git
13:02 zumba_addict joined #git
13:03 candelabra If I have an application stored in git, and I want to reuse the application in say 3-4 different deployments, making subtle changes to each.  Can I make multiple forks to do that?  Is there a better approach to get this functionality using git/github?
13:03 psprint_ joined #git
13:04 psprint_ Hello. Will git clone normally download only one branch? How to download all of them?
13:04 guardian hello, what's the proper way to move on from warning: reflog of 'refs/remotes/origin/foo' references pruned commits
13:04 gordonjcp candelabra: can you factor the changes out into something like a configuration file?
13:04 BlaXpirit candelabra, well you could theoretically make the application configurable :|
13:05 gordonjcp candelabra: or if it genuinely has to be code changes, could you put them even in a source file of their own?
13:05 candelabra gordonjcp, BlaXpirit Maybe I'm being lazy but I was hoping to use the forking progress to avoid adding code complexity
13:05 gordonjcp candelabra: you could go nuts with it and make them plugins
13:06 candelabra forking process*
13:08 JeroenT_ joined #git
13:08 fuchstronaut Is there a way to add a single line to the previously done commit (not pushed)
13:08 diegoviola joined #git
13:09 rwb joined #git
13:09 moritz fuchstronaut: use "git add -p thefile" to add the relevant chunk to the index
13:09 moritz fuchstronaut: and then run git commit --amend -C HEAD
13:10 flaguy48 joined #git
13:10 moritz fuchstronaut: ... or leave out the -C HEAD if you want to edit the commit message again
13:10 hanthings joined #git
13:10 snowkidind joined #git
13:11 fuchstronaut moritz: thank you, that worked like a charm
13:11 moritz fuchstronaut: you're welcome
13:13 mdw joined #git
13:16 bsanford joined #git
13:17 jstein_ joined #git
13:18 cdown joined #git
13:20 Scisk joined #git
13:22 martinkl_ joined #git
13:22 jceb joined #git
13:24 rnsanchez_ joined #git
13:25 JeroenT joined #git
13:25 joko joined #git
13:25 joko Hello, is there a way to sync a github fork with all upstream branches?
13:26 grawity git fetch upstream; git push fork refs/remotes/origin/*:refs/heads/*
13:26 grawity er, refs/remotes/upstream/*:refs/heads/*
13:26 joko grawity: bingo, thanks!
13:30 joko And any way to check if some branches were removed?
13:30 grawity git fetch -p/--prune upstream
13:30 grawity should also work when pushing
13:31 grawity adding -n would just show the removed branches, as would `git remote show upstream` I think
13:31 maucar joined #git
13:31 fuchstronaut As I just can not remember: how do I rebase branch A on branch B? git checkout A; git rebase B?
13:32 joko grawity: many thanks
13:32 joko fuchstronaut: my mnemonic is git rebase master topic
13:32 grawity fuchstronaut: should work
13:32 joko so you could go with git rebase B A
13:33 fuchstronaut Actually I would like to have a new branch on top of B that contains all commits of A and B
13:33 fuchstronaut like... C
13:34 grawity I'd say "git branch C B" but
13:34 joko fuchstronaut: so B is on top of A and C is on top of B?
13:34 grawity not sure if what you ask is even possible after A was rebased on top of B
13:35 fuchstronaut My situation is: I have two branches based on master. A and B. now I want to have B on top of A
13:35 fuchstronaut Or C on top of A that contains all commits of B
13:35 fuchstronaut I don
13:35 psprint_ How to download all branches? later pull --all?
13:35 fuchstronaut I don't think that really matters
13:37 grawity fuchstronaut: for the former, check out B, rebase A
13:37 grawity fuchstronaut: for the latter, branch C A, checkout C, merge A
13:38 joko ditto
13:38 joko actually merge B
13:38 fuchstronaut grawity: not merge B?
13:38 grawity ah yes
13:38 linx joined #git
13:38 diego2 joined #git
13:38 fuchstronaut Will i actually screw something up on the server if both A and B are already pushed and I rebase them locally and then push?
13:39 diego2 joined #git
13:39 prefix joined #git
13:39 jast if you have pushed, then rebase and push again, git will actually refuse the push (because it *looks* like the server has commits you don't have, namely the old versions of the commits you rebased)
13:40 fuchstronaut well, then I guess the C-option is the way to go
13:40 jast if you try to fix that by using pull/merge, you'll create a tangled mess
13:40 jast if you force push, the old versions will get eradicated, but anyone who still has the old version in their own clone can still create that tangled mess if they do the pull/merge
13:40 notebox joined #git
13:40 fuchstronaut thats something I don't think I want to do
13:41 jast if there are no other people who have a copy, a force push is typically a good solution
13:41 jaguarmagenta joined #git
13:41 fuchstronaut there are, so will I be safe just making a new branch and then pushing it?
13:41 fuchstronaut like grawity suggested
13:41 chuertab joined #git
13:42 jast sure, a fresh branch is safe
13:42 fuchstronaut thanks
13:44 ochorocho__ joined #git
13:45 eletuchy joined #git
13:47 jyjon joined #git
13:48 fmcgeough joined #git
13:50 grill_U joined #git
13:51 phanimahesh joined #git
13:52 davisonio joined #git
13:52 fscala joined #git
13:53 unbalancedparen joined #git
13:54 BombStrike joined #git
13:54 t0by joined #git
13:54 ullu left #git
13:55 kadoban joined #git
13:55 AaronMT joined #git
13:55 e11en joined #git
13:56 arthurl joined #git
13:56 AaronMT joined #git
13:56 sagerdearia joined #git
13:57 madewokherd joined #git
13:59 sangy joined #git
14:00 bsanford joined #git
14:00 GodGinrai joined #git
14:01 stantonk joined #git
14:01 JanC_ joined #git
14:01 hanthings joined #git
14:01 efdetonator joined #git
14:01 nivag joined #git
14:01 linx joined #git
14:03 mangolisk_ joined #git
14:07 chrisshattuck joined #git
14:08 rubyonrailed joined #git
14:08 r_s_o could I get some help with some submodules please?
14:08 selckin !ask
14:08 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
14:08 GodGinrai r_s_o: just ask your question.
14:08 ExoUNX joined #git
14:09 r_s_o is it possible to include username/password in gitmodule files?
14:09 r_s_o so I can clone private repos
14:09 afuentes joined #git
14:09 Guest6548 joined #git
14:09 Codfection joined #git
14:10 suneg joined #git
14:11 dzho joined #git
14:13 ShekharReddy joined #git
14:13 jyjon joined #git
14:13 dzho joined #git
14:14 toogley joined #git
14:14 CJKinni joined #git
14:14 e11n joined #git
14:15 FunkyAss r_s_o: do you mean in the submodule url? it guess you can, but that doesn't seem like a nice idea (since your username and password will be in your history)
14:15 e11en left #git
14:15 r_s_o yeah in the submodule url
14:16 r_s_o would the syntax be https://username:password@github.com/user/repos.git
14:16 FunkyAss I would focus on the "that doesn't seem like a nice idea" part
14:17 sondr3 joined #git
14:18 r_s_o hmm ok
14:19 stantonk joined #git
14:21 NeverDie joined #git
14:21 FunkyAss I use to specify an ssh or anonymous clone over http/git there. Regarding ssh urls, my ssh setup automagically picks the right username (based on host name) and ssh key
14:21 dzho joined #git
14:22 NeverDie joined #git
14:22 FunkyAss that way you don't let personal info sneak into the history but let's you clone private repos without many problems
14:22 FunkyAss *lets
14:22 D-Boy joined #git
14:23 jchonig joined #git
14:23 Guest73250 joined #git
14:24 lolmac joined #git
14:25 nnyk_ joined #git
14:26 shgysk8zer0 joined #git
14:26 linx joined #git
14:26 suneg joined #git
14:27 zumba_addict joined #git
14:27 demiro joined #git
14:27 phaleth joined #git
14:27 imjacobclark joined #git
14:28 suneg Hi all, quick question about merge. I have two branches A and B. Branch A has a couple of new files added. Branch B has some other changes. git checkout A; git merge B results in conflicts saying "deleted by them" for the new files on A. My intuition tells me this should be a no-brainer for Git. What could I be missing?
14:28 ki0_ joined #git
14:30 GodGinrai suneg: those added files are committed?
14:30 eatsfoobars joined #git
14:30 GodGinrai suneg: and they weren't removed in a previous commit in B?
14:30 suneg Yes, I pulled both branches from a repo elsewhere to do the merge on my box
14:30 suneg Nope, doesn't look like it
14:31 GodGinrai hrmmm
14:31 suneg I did a "git log a -- file" to verify changes to the file on both branches
14:31 suneg It only ever existed on branch A
14:31 xaviergmail joined #git
14:33 rubyonrailed joined #git
14:35 suneg Come to think of it, I think I'll try to merge only the first couple of commits of B into A, to see when the problem occurs.
14:35 sylario joined #git
14:35 tvon joined #git
14:36 wrouesnel joined #git
14:38 tvw joined #git
14:39 linx joined #git
14:41 RedNifre joined #git
14:42 thiago joined #git
14:43 shinnya joined #git
14:43 artemisart joined #git
14:44 TooLmaN joined #git
14:45 aard_ joined #git
14:47 internetbird joined #git
14:48 acetakwas joined #git
14:53 lindenle joined #git
14:55 subhojit777 joined #git
14:55 NimeshNeema joined #git
14:57 jceb joined #git
14:58 podbay joined #git
14:58 clemf joined #git
14:58 podbay Hello.  How can I see the code changes made in a branch from when it was created to when it was merged back to master?
14:59 darkbit joined #git
14:59 eletuchy joined #git
15:01 madewokherd joined #git
15:02 suneg I guess you could see it with "git diff merge-commit-id..branch-point-id"
15:03 nnyk_ joined #git
15:04 bruce_lee joined #git
15:04 edude03 joined #git
15:07 crose joined #git
15:08 ousann joined #git
15:09 podbay suneg: is it possible to do this without checking out the branch?
15:09 suneg Yes
15:09 ki0 joined #git
15:09 GodGinrai podbay: git diff branch_you_want_to_know_about master
15:11 GodGinrai oh wait
15:11 GodGinrai I read that wrong
15:11 retropikzel joined #git
15:12 chrisshattuck joined #git
15:13 mmmveggies joined #git
15:13 JeroenT_ joined #git
15:14 lordjancso joined #git
15:19 dmto joined #git
15:19 narendraj9 joined #git
15:20 eletuchy joined #git
15:22 phanimahesh joined #git
15:23 zumba_addict joined #git
15:24 tyreld joined #git
15:28 quetz joined #git
15:28 ahmedelgabri joined #git
15:28 Tim-SEM joined #git
15:28 Tim-SEM left #git
15:29 rolha joined #git
15:29 LionsMane joined #git
15:32 edude03 joined #git
15:32 tvw joined #git
15:35 jyjon joined #git
15:37 digidog joined #git
15:37 jbitdrop joined #git
15:39 st0opkid joined #git
15:40 jyjon joined #git
15:41 edude03 joined #git
15:42 jaguarmagenta joined #git
15:44 ousann joined #git
15:44 Guest6548 joined #git
15:44 ochorocho__ joined #git
15:45 throstur joined #git
15:46 throstur I am running ssh-agent, how come I have to enter my passphrase for my rsa key anyway??
15:46 Afforess joined #git
15:46 synthroid joined #git
15:46 _ikke_ did you export the ssh agent env variables?
15:46 throstur I run sshagent with eval($ssh-agent)
15:46 throstur on my xinitrc
15:47 lindenle joined #git
15:47 throstur I mean eval $(ssh-agent)
15:47 diegoviola joined #git
15:48 Electrometro joined #git
15:48 gniourf joined #git
15:49 throstur ah I figured it out, needed to add the key (thought I had, my mistake)
15:49 nettoweb joined #git
15:49 throstur must have added it without exporting variables
15:50 throstur wait a minute.... ssh-agent doesn't cache passwords between reboots or what
15:50 ochorocho__ joined #git
15:51 throstur guess I don't need a passphrase...
15:51 _ikke_ throstur: Is the passphrase the same as your login password?
15:51 throstur yes
15:52 throstur I thought that would be easy to remember
15:52 throstur _ikke_: does that simplify anything? I'm trying to get rid of the passphrase prompt so that I can git pull on a systemd timer
15:53 _ikke_ I noticed that it somehow can reuse the login password for the passphrase
15:53 throstur oh, do you know how?
15:53 _ikke_ not really
15:54 TomyLobo joined #git
15:54 tvon joined #git
15:54 Felishia left #git
15:56 chuertab joined #git
15:56 kpease joined #git
15:57 piling joined #git
15:58 throstur alright, well removing the passphrase did what I wanted
15:58 _pix left #git
15:59 _ikke_ Makes your key more vulnerable
15:59 anon413 joined #git
16:01 romerocesar joined #git
16:01 Guest6548 joined #git
16:02 anon413 -
16:02 eletuchy joined #git
16:02 _ikke_ |
16:02 anon413 hello. new & confused by git-show
16:03 throstur anon413: how did you get voice
16:03 BlaXpirit exactly my question
16:03 kadoban The bot gives it to you if you ask I thought.
16:03 throstur !up
16:03 _ikke_ .voice
16:03 throstur .voice
16:04 throstur yay I'm not at the bottom of userlist
16:04 throstur anon413: what's your problem, git-show you say??
16:04 throstur https://git-scm.com/docs/git-show
16:05 tvw joined #git
16:07 anon413 sorry i am new to irc too, damn
16:08 BombStrike joined #git
16:09 diegoviola joined #git
16:09 thiago joined #git
16:09 ArSn joined #git
16:10 ArSn Hi guys
16:10 annoymouse joined #git
16:10 aep-shoutlet joined #git
16:10 ajf- joined #git
16:12 ArSn so I am trying to get rid of a commit from the annotations (primarily, but I guess that means from the history (i.e. the "tree")), and I used this approach to do it: git filter-branch --tree-filter 'git diff-tree --name-only --diff-filter=AM -r --no-commit-id 0867e54002195d16dbfb69076d1df2d8b1f83e6f' HEAD
16:12 ArSn Wherein 0867... is my commit has that I want to get rid of
16:12 _ikke_ anon413: What are you confused about?
16:13 ArSn however, filter-branch does not appear to be working, all I get is an: WARNING: Ref 'refs/heads/master' is unchanged
16:13 ArSn :( any ideas about that?
16:13 _ikke_ ArSn: your tree filter does not actually do anything
16:14 ki0_ joined #git
16:14 ArSn _ikke_: hm... I seem to not grasp the concept of this
16:14 ArSn I read the docs over and over but seems I am too dumb - how can I tell it to remove this commit from the history?
16:14 ArSn (while keeping the changes, that is)
16:15 rubyonrailed joined #git
16:15 _ikke_ If you want to filter out a commit, you want --commit-filter
16:16 ArSn wouldn't that also remove the changes that were made in that commit?
16:16 _ikke_ nope
16:16 ArSn ooh, then it sounds just perfect
16:16 stantonk joined #git
16:16 _ikke_ "NOTE the changes introduced by the commits, and which are not reverted by subsequent commits, will still be in the rewritten branch. If you want to throw out changes together with the commits, you should use the interactive mode of git rebase. "
16:17 diogenese joined #git
16:17 ArSn nice
16:17 stantonk joined #git
16:17 anon413 Should I slash msg or just username: ?
16:17 ArSn I don't get what the docs on --commit-filter want to tell me though xD it appears that I have to set all parent commits?
16:18 ArSn _ikke_: only if it is not asked too much, can you give an example on how it should be possible what I am trying to do?
16:19 FunkyAss anon413: write here so that anybody can read and, possibly, answer. feel free to address the nick you're answering to
16:19 ArSn something like "--commit-filter skip_commit "<my hash>""
16:19 ArSn ?
16:19 ki0 joined #git
16:20 mkopriva joined #git
16:20 benwbooth joined #git
16:22 ArSn well now I screwed up my clone xD
16:22 imjacobclark joined #git
16:22 dadada joined #git
16:22 dadada hi
16:23 dadada I think git is using my $USER name when connecting with our local git server
16:23 dadada the $USER name is different from what the server expects
16:23 FunkyAss if it's over ssh, then it's ssh
16:24 ansimation joined #git
16:24 yqt joined #git
16:25 Gamecubic joined #git
16:25 jceb joined #git
16:27 demiro joined #git
16:28 grawity dadada: that's because your remote url did not specify any
16:29 grawity dadada: you probably want git@whatever.com.in there
16:29 arthurl joined #git
16:31 howdoi joined #git
16:34 eletuchy joined #git
16:36 thiago joined #git
16:36 wrouesnel1 joined #git
16:37 rolha joined #git
16:38 MistahKurtz joined #git
16:39 Wlkbe joined #git
16:39 romerocesar joined #git
16:41 ki0 joined #git
16:43 guardian hello, what's the proper way to move on from warning: reflog of 'refs/remotes/origin/foo' references pruned commits
16:43 nettoweb joined #git
16:44 akushner joined #git
16:45 jh3 joined #git
16:46 tvon joined #git
16:46 svankmajer joined #git
16:48 ArSn _ikke_: it does actually remove the change too, after I got it working with skip_commit :(
16:48 nnyk_ joined #git
16:50 troulouliou_div2 joined #git
16:50 grawity guardian: git reflog expire etc. etc.
16:50 akushner joined #git
16:53 rxc joined #git
16:53 rxc joined #git
16:54 bb010g joined #git
16:57 Timvde I have some changed code, and I want to commit a part of it on another branch. I already interactively staged it. I can commit, stash, checkout, cherry-pick, checkout -, reset to HEAD~ and stash pop, but that sounds devious
16:57 elastix joined #git
16:57 Timvde Is there a shorter way to do it?
16:58 Electrom_ joined #git
17:00 EvilPenguin joined #git
17:01 anon413 Alright. I am trying to get the content of a file at a specific revision. I've googled a bit and got "git show REV -- filename", which works but then gives me a diff. If I try "git show REV:filename", then I get no output.
17:02 courrier joined #git
17:02 subhojit777 joined #git
17:02 anon413 Another command that works is: git checkout REV filename
17:02 anon413 but this overwrites the current file, which I dont necessarily want.
17:03 subhojit777 joined #git
17:04 jceb joined #git
17:09 tvon joined #git
17:09 stantonk joined #git
17:11 anon413 Ok, "git show REV:filename" didn't work because filename contained backward slashes instead of forward.
17:12 flavius joined #git
17:12 Darcidride joined #git
17:13 mikecmpbll joined #git
17:15 robotroll joined #git
17:16 Eugene That's a shell-escpaing problem, not a git problem
17:16 Eugene Escape the slashes
17:17 j416 Timvde: not really. Make smaller commits and work on the right branch :)
17:18 j416 Timvde: if the other changed don't conflict, you can just checkout then commit
17:18 hahuang61 joined #git
17:18 j416 other changes*
17:18 j416 (sorry, I
17:18 j416 'bah
17:19 j416 I'm on silly phone keyboard)
17:19 anon413 Eugene: yes i got it working. didnt mean to blame git hehe
17:20 jimi_ joined #git
17:20 Timvde j416: yea, I've been a bit messy. I was working on a feature, and while writing tests, I refactored some ugly part in the tests, but I actually want to commit that to master asap
17:20 Timvde so I had to pull it out
17:20 j416 makes sense
17:20 Ploppz joined #git
17:20 Timvde I already did it the way I said, I was just curious if there was an easier way
17:20 j416 only the one I mentioned above
17:21 j416 could commit instead if stash, perhaps easier. Perhaps not.
17:21 Timvde Yea, but there were conflicts
17:21 j416 of*
17:21 Ploppz I seem to have pushed a branch to the remote repo, then renamed it and pushed again, making two branches on remote pointing to the same commit. How do I delete one? Tried: https://bpaste.net/show/a52fd1cb4c26
17:21 Timvde anyway, thanks :)
17:21 InfoTest joined #git
17:22 j416 Ploppz: remove the prefix
17:22 Ploppz ah thanks. only got tab completion with origin/..
17:23 yude joined #git
17:23 eletuchy_ joined #git
17:23 maestrojed joined #git
17:26 romerocesar joined #git
17:27 _ng joined #git
17:27 acetakwas joined #git
17:27 Timvde Hmm, doesn't git cherry-pick have a "theirs" like git merge?
17:28 eletuchy joined #git
17:28 Timvde oh, nvm, also -X :)
17:29 hlysig joined #git
17:29 piling_ joined #git
17:31 eletuchy_ joined #git
17:33 eletuch__ joined #git
17:34 jceb joined #git
17:36 dreiss joined #git
17:36 eletuchy joined #git
17:38 tgunr joined #git
17:39 akushner joined #git
17:40 SwiftMatt joined #git
17:40 linx joined #git
17:42 jaguarmagenta joined #git
17:42 thiago joined #git
17:43 rolha joined #git
17:45 nnyk_ joined #git
17:46 dsdeiz joined #git
17:46 dsdeiz joined #git
17:47 elsevero joined #git
17:47 rnsanchez joined #git
17:47 hahuang65 joined #git
17:48 JelmerD joined #git
17:49 holodoc joined #git
17:50 zumba_addict joined #git
17:54 Jason_ joined #git
17:54 toogley joined #git
17:55 cdown joined #git
17:56 WaReZ joined #git
17:57 mda1_ joined #git
18:00 Aboba joined #git
18:01 Jason_ joined #git
18:01 CJKinni joined #git
18:02 jimi_ joined #git
18:03 LionsMane joined #git
18:04 ochorocho__ joined #git
18:04 zivester joined #git
18:08 DieguezZ joined #git
18:10 ochorocho__ joined #git
18:15 linx joined #git
18:15 happy-dude joined #git
18:17 Guest6548 joined #git
18:18 mwhooker joined #git
18:19 foist joined #git
18:19 f3r70rr35f joined #git
18:20 Dyonisos joined #git
18:20 jost_ joined #git
18:22 ahmedelgabri joined #git
18:23 _ikke_ ArSn: Odd, documentation states otherwise
18:24 nitin joined #git
18:24 Sasazuka joined #git
18:30 arooni joined #git
18:31 mwhooker joined #git
18:34 xall joined #git
18:35 tinajohnson___ joined #git
18:36 yqt joined #git
18:37 sssilver joined #git
18:39 FunkyAss joined #git
18:40 enleeten_ joined #git
18:41 r_s_o joined #git
18:45 deepy joined #git
18:45 mdw joined #git
18:46 liranp joined #git
18:46 Balliad joined #git
18:47 arooni joined #git
18:47 jwest joined #git
18:48 piattino joined #git
18:49 nettoweb joined #git
18:52 nitin joined #git
18:52 Balliad joined #git
18:53 Oog joined #git
18:54 molt joined #git
18:55 jwest joined #git
18:55 mingrammer_ joined #git
18:58 stantonk joined #git
19:01 JrCs joined #git
19:02 ncthom91 joined #git
19:02 stantonk joined #git
19:02 ddr2 joined #git
19:03 mwhooker joined #git
19:03 ochorocho__ joined #git
19:03 Dev0n joined #git
19:03 SwiftMatt joined #git
19:04 dbolser joined #git
19:04 yang joined #git
19:05 qlkzy joined #git
19:06 pitastrudl joined #git
19:06 stonerfish joined #git
19:07 GingerGeek joined #git
19:07 GingerGeek joined #git
19:07 garethdaine_ joined #git
19:07 ahf joined #git
19:08 Hogofwar joined #git
19:08 JyZyXEL joined #git
19:08 Exagone313 joined #git
19:08 yaiyan joined #git
19:08 robotroll joined #git
19:09 ochorocho__ joined #git
19:11 elsevero joined #git
19:14 ynanm joined #git
19:14 afuentes joined #git
19:15 gnoirzox joined #git
19:16 martinkl_ joined #git
19:16 Lewix joined #git
19:17 Lewix im trying to track a branch but i get the following
19:17 Balliad joined #git
19:17 Hogofwar joined #git
19:17 Lewix https://www.irccloud.com/pastebin/c2GopHE2/
19:17 Lewix why is it ambigous?
19:18 Lewix https://www.irccloud.com/pastebin/vlxypsJV/
19:19 retropikzel joined #git
19:19 mikecmpbll joined #git
19:19 eletuchy joined #git
19:20 xall joined #git
19:21 xall joined #git
19:24 ochorocho__ joined #git
19:24 xall joined #git
19:25 toocwa joined #git
19:26 Lewix join #github
19:26 xall joined #git
19:27 toocwa I just did "git checkout master" and got a lot of lines output like:
19:27 toocwa D directory/file
19:27 toocwa I thought that meant it deleted them, but those files should exist, and still do exist
19:28 toocwa It also said my branch was ahead of origin/master
19:28 toocwa I hard reset head and did push puill and it says everything is up to date.. all those files seem to be there
19:28 toocwa Think I'm ok?
19:28 ullu joined #git
19:28 toocwa Just seemed really odd I'm not sure what happened :|
19:29 stantonk joined #git
19:30 toocwa never mind, OMG i goofed and seriously confused myself, i was running it from the wrong directory
19:30 toocwa always notice these things AFTER asking for help!
19:31 toocwa have a lot of stuff to delete now :')
19:32 ExoUNX joined #git
19:32 xpk joined #git
19:32 jottr joined #git
19:33 TiagoEDGE joined #git
19:33 satifant joined #git
19:33 * toocwa tries not to screw up rm command
19:33 xall joined #git
19:34 nettoweb joined #git
19:34 mingrammer_ joined #git
19:36 xall joined #git
19:37 Ahmed90 joined #git
19:38 romerocesar joined #git
19:38 inflames joined #git
19:38 mwhooker joined #git
19:39 edude03 joined #git
19:40 durham joined #git
19:40 toocwa left #git
19:41 durham joined #git
19:41 xaviergmail joined #git
19:41 xall joined #git
19:41 JeDa joined #git
19:43 sangy joined #git
19:45 editshare-ericf joined #git
19:45 nettoweb joined #git
19:46 hlysig joined #git
19:47 eijk joined #git
19:47 hlysig joined #git
19:48 arescorpio joined #git
19:48 romerocesar joined #git
19:54 MattMaker joined #git
19:55 raijin joined #git
19:56 hlysig joined #git
19:56 xall joined #git
19:58 hlysig joined #git
20:00 xall joined #git
20:02 boshhead joined #git
20:02 jstein_ joined #git
20:02 eletuchy_ joined #git
20:02 cdown joined #git
20:05 eletuchy joined #git
20:06 axiom_1 joined #git
20:06 hlysig_ joined #git
20:09 eletuchy_ joined #git
20:09 stantonk joined #git
20:10 jeffreylevesque joined #git
20:10 whomp joined #git
20:10 fscala joined #git
20:11 whomp so i made a bunch of changes to a file, then accidentally checked it out from an older commit. can i undo this checkout?
20:12 eletuchy joined #git
20:12 tobiasvl whomp: did you checkout -f ?
20:12 whomp tobiasvl, no
20:12 tobiasvl were your changes commited or staged?
20:13 whomp tobiasvl, neither
20:13 jeffreylevesque_ joined #git
20:13 tobiasvl hm, then I don't think git should have let you overwrite them without -f
20:13 rahtgaz joined #git
20:13 whomp tobiasvl, what should i do?
20:13 mwhooker joined #git
20:14 tiagoedge_ joined #git
20:14 whomp tobiasvl, did `git co head~1 -- path/to/file`
20:15 irco joined #git
20:16 hlysig joined #git
20:16 tobiasvl hm, just checked, it actually lets you do it. that's unfortunate. I don't think there's anything you can do, unfortunately, but I'll let other people verify
20:16 Raging_Hog joined #git
20:16 neilthereildeil joined #git
20:16 alaing joined #git
20:17 neilthereildeil how can i get a file from a specific commit? i used git show COMMIT, but that gives me the diff
20:17 neilthereildeil i need the full file without the git formatting
20:17 alaing hi i'm using git-crypt in a repo how do I uninstall it just for that repo
20:17 tobiasvl neilthereildeil: "get" the file how? check it out? git checkout COMMIT -- FILE
20:18 neilthereildeil i want to save it to an external location without modifying my tree
20:18 eletuchy_ joined #git
20:18 neilthereildeil git git show COMMIT > /tmp/file.c
20:18 neilthereildeil but file.c has a but of diff markings
20:18 neilthereildeil like > > >
20:18 romerocesar joined #git
20:19 efdetonator joined #git
20:19 nitin joined #git
20:19 m0viefreak joined #git
20:20 FunkyAss joined #git
20:21 neanderslob joined #git
20:21 martinkl_ joined #git
20:22 tobiasvl neilthereildeil: git show COMMIT:FILE
20:22 xall joined #git
20:22 Skipp_OSX joined #git
20:22 Skipp_OSX is there a way to get 'git diff' to show the lines of deleted files in the diff?
20:23 Guest6548 joined #git
20:23 rwb joined #git
20:23 neilthereildeil tobiasvl: nice, thanks
20:24 eletuchy joined #git
20:24 nilg joined #git
20:24 thiago joined #git
20:25 MattMaker joined #git
20:25 eletuch__ joined #git
20:26 xall joined #git
20:27 ansimation joined #git
20:27 stantonk joined #git
20:28 neilthereildeil left #git
20:28 mingrammer_ joined #git
20:28 alaing hi i'm using git-crypt in a repo how do I uninstall it just for that repo
20:28 sgen joined #git
20:29 alaing so files arent encrypted
20:29 eletuchy joined #git
20:32 eletuchy_ joined #git
20:32 IWishIKnew joined #git
20:33 Skipp_OSX nm I figured it out
20:34 eletuch__ joined #git
20:34 c0ded joined #git
20:34 fnky joined #git
20:36 xall joined #git
20:37 FuzzySockets joined #git
20:37 eletuchy joined #git
20:38 maucar joined #git
20:38 Noldorin joined #git
20:39 ansimation joined #git
20:39 eletuchy_ joined #git
20:39 interne7y joined #git
20:42 eletuchy joined #git
20:47 ahr3n joined #git
20:47 eletuchy joined #git
20:47 smithbone joined #git
20:49 romerocesar joined #git
20:49 eletuchy_ joined #git
20:51 eletuch__ joined #git
20:51 MattMaker joined #git
20:52 thiago joined #git
20:54 darkbit joined #git
20:56 eletuchy joined #git
20:56 jumpman What level of granularity should I look for in my git commit history?
20:56 tiagoedge_ joined #git
20:58 eletuchy_ joined #git
20:58 holdsworth joined #git
20:58 BlaXpirit jumpman, whatever you like
20:58 BlaXpirit just aim for consistency
20:59 ansimati_ joined #git
20:59 ahr3n joined #git
20:59 _ikke_ alaing: That's not so easy, all the history is based on encrypted content
20:59 jumpman i feel like mine so far reflect the approximate time it took to code something rather than something more... specific
21:00 jumpman which is to say, i could do a dozen changes on the home page in 1 commit and add one feature to the app in 1 commit and it gives me a mix of more/less generic commit messages
21:00 alaing _ikke_: so i cant do git-crypt unlock and the remove the .git-crypt folder and .gitattributes
21:00 alaing ?
21:01 eletuchy joined #git
21:01 ansimati_ joined #git
21:02 _ikke_ alaing: Then you would not be able to see / checkout older commits anymore, as they're still encrypted
21:02 _ikke_ at least, for the files that are encrypted
21:02 alaing _ikke_: ah i see, good point
21:03 alaing i'm not too concerned about the history of the files
21:03 eletuch__ joined #git
21:03 Arban joined #git
21:04 nnyk_ joined #git
21:05 eletuchy_ joined #git
21:06 theskillwithin joined #git
21:06 tiagoedge_ joined #git
21:06 jeffreylevesque joined #git
21:08 FunkyAss joined #git
21:08 eletuchy joined #git
21:09 mmlb joined #git
21:10 eletuch__ joined #git
21:11 optraz joined #git
21:12 optraz after first push to branch, subsequent push, do i still need to specify the branch name or it is implicit? like so, $git push origin
21:13 cdown_ joined #git
21:13 eletuchy joined #git
21:15 optraz anyone?
21:15 _ikke_ optraz: You need to add tracking information once
21:15 _ikke_ git push -u origin foo
21:15 _ikke_ The -u will set up tracking information
21:16 _ikke_ And it also depends on your push.default setting
21:16 eletuchy_ joined #git
21:16 optraz so on the first push, if i give -u , then subsequent push, `git push origin` is sufficient?
21:17 optraz and what is push.default setting? where can i check that?
21:17 rnsanchez_ joined #git
21:17 _ikke_ git config push.default
21:18 sgen can I push a commit to the stash?
21:18 _ikke_ no
21:18 optraz git config push.default return nothing
21:19 lb any chance, that someone has a quick bash snippet, that does a git clone <repo> for every repo that is return by a ssh <gitolite-server> ?
21:19 _ikke_ optraz: what version of git do you have?
21:19 lb (more a gitolite question)
21:20 optraz _ikke_: 2.8.1
21:20 eletuchy joined #git
21:20 MattMake_ joined #git
21:20 _ikke_ optraz: Then it defaults to 'simple'
21:20 radsy joined #git
21:21 lb man git config -> search for push.default
21:21 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
21:22 eletuchy_ joined #git
21:22 optraz so _ikke_ , given -u, subsequent push without specify branch is implicit ?
21:23 lb !tracking
21:23 gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote
21:23 ldlework joined #git
21:23 mingrammer_ joined #git
21:23 ascarter joined #git
21:23 lb hm no thats not the trigger in meant
21:23 boombatower joined #git
21:23 lb optraz but in short, yes
21:23 lb optraz with git push -u you set up a tracking branch for this branch
21:24 lb aka "it's default counterpart " on a specifig remote
21:24 lb after that, a normal git push will (if the push.default setting is set up appropriatly, the simple is sufficient) push to the configured remote tracking branch
21:25 m0j0 joined #git
21:25 eletuchy joined #git
21:25 lb you can change that by using git push -u <another remote> <branch> again
21:25 optraz k
21:25 optraz thank you
21:27 lb yw
21:27 eletuch__ joined #git
21:29 eletuchy_ joined #git
21:30 Guest6548 joined #git
21:31 _rnsanchez_ joined #git
21:32 NyB joined #git
21:32 stantonk joined #git
21:33 Doginal joined #git
21:34 nettoweb joined #git
21:34 stantonk joined #git
21:34 eletuchy joined #git
21:34 lindenle joined #git
21:35 Skipp_OSX left #git
21:35 NyB So, I got one of my Git repositories into a bit of a pickle. It turns out that diff. versions of hg-git do not generate the same commit ids in Git. End result is a Git repo. with a whole bunch of duplicate commits. Is there an easy way to fix this? Rebasing is OK - I have full control of all clones of the repo.
21:37 Vinnie_win joined #git
21:37 raijin joined #git
21:38 eletuchy_ joined #git
21:39 Darcidride joined #git
21:40 d0nn1e joined #git
21:40 Darcidride joined #git
21:40 ojacobson rebasing is how you fix that, if you can identify the tip-most dup commit
21:40 eletuch__ joined #git
21:40 ojacobson are they dups with parallel history, or dups in the same history? (is there a commit a that is duplicated as a_dup such that a_dup is in git log a?)
21:41 zerocua joined #git
21:41 Eugene !lol is probably really helpful for this mess
21:41 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
21:42 NyB ojacobson: parallel histories, AFAICT
21:42 ojacobson yeah, you'll want a visualizer for this
21:42 NyB as in completely parallel
21:42 ojacobson you can graft commits around using git-rebase
21:42 ojacobson probably the easiest way to do it, which is saying something
21:42 snowkidind joined #git
21:43 ojacobson once you identify the tip-most commit you want to graft, the root-most commit you want to graft, and the commit you want to graft onto: git rebase --onto <commit to graft onto> <tip-most commit to graft> <root-most commit to graft>
21:44 jumpman So, I forked branch B from branch A, and I made some changes to B, committed those changes, then squashed them with an earlier commit in branch B
21:44 jaguarmagenta joined #git
21:44 jumpman I want to pull those changes back into branch A... can I do that?
21:44 NyB ojacobson: ah, I thnk I was missing one of the arguments there...
21:44 NyB ojacobson: let's see what that will do :-)
21:45 ojacobson if you have multiple heads you want to graft, things get more complicated
21:45 ojacobson you can do it with multiple rebase steps
21:45 ojacobson (also, fixing up tags and branch labels left as an exercise)
21:46 jumpman i have a better idea
21:46 jumpman i should rename branch B
21:46 jumpman it's only tracked locally right now anyways
21:47 barteks2x joined #git
21:47 rnsanchez_ joined #git
21:48 madewokherd joined #git
21:59 joki joined #git
22:00 FunkyAss joined #git
22:00 Guest6548 joined #git
22:01 rkazak joined #git
22:03 jeffreylevesque joined #git
22:04 elastix joined #git
22:04 Repox joined #git
22:04 stantonk joined #git
22:06 axl_ joined #git
22:06 NyB left #git
22:08 ncthom91 joined #git
22:08 xaviergmail joined #git
22:08 whomp joined #git
22:08 heinrich5991 joined #git
22:11 txt-file joined #git
22:12 ash_workz joined #git
22:12 txt-file Is there a way to use a different command then ssh for SSH connections?
22:12 txt-file I am using dropbear 99.999% of the time and want to also use it in git.
22:13 osse txt-file: yes, set the GIT_SSH or GIT_SSH_COMMAND env vars
22:13 txt-file no option to set it with "git config --global"?
22:16 osse not that i know of
22:16 Rodya_ joined #git
22:16 txt-file :-(
22:16 mingrammer_ joined #git
22:17 infra-red joined #git
22:17 txt-file kk … at least setting the enviroment variable worked
22:18 txt-file thank you osse
22:18 f3r70rr35f joined #git
22:19 thiago joined #git
22:20 infra-red joined #git
22:22 sdothum joined #git
22:23 d4rklit3 joined #git
22:24 HoierM joined #git
22:24 jeffreylevesque joined #git
22:25 zivester joined #git
22:28 chrisshattuck joined #git
22:29 eletuchy joined #git
22:29 raininja joined #git
22:29 Rodya_ joined #git
22:31 eletuchy_ joined #git
22:32 axl_ left #git
22:35 eletuchy joined #git
22:35 txt-file left #git
22:38 jottr joined #git
22:39 eletuchy_ joined #git
22:40 cdg joined #git
22:40 cdown joined #git
22:41 cdown_ joined #git
22:42 eletuchy joined #git
22:44 eletuch__ joined #git
22:45 maucar joined #git
22:46 espindola joined #git
22:47 eletuchy joined #git
22:47 jbitdrop_ joined #git
22:49 eletuchy_ joined #git
22:49 jumpman ok, now i've really fucked up
22:49 jumpman i squashed what should not have been squashed
22:51 eletuch__ joined #git
22:51 mischat joined #git
22:52 rkazak joined #git
22:53 mwhooker joined #git
22:54 eletuchy joined #git
22:58 jumpman so, i have a commit on `develop` called 'Commit A' and branch called `Branch B`
22:58 st0opkid joined #git
22:58 jumpman on `Branch B` I accidentally amended `Commit A` several times; now I want to merge branch B into develop
22:58 jumpman what the heck do i have to do :L
22:59 eletuchy_ joined #git
23:00 romerocesar joined #git
23:01 eletuch__ joined #git
23:01 setuid joined #git
23:01 setuid joined #git
23:04 eletuchy joined #git
23:04 hahuang61 joined #git
23:06 eletuchy_ joined #git
23:07 Electrometro joined #git
23:08 eletuch__ joined #git
23:08 stantonk joined #git
23:10 romerocesar joined #git
23:11 mingrammer_ joined #git
23:12 eletuchy joined #git
23:14 dreiss joined #git
23:15 eletuchy_ joined #git
23:16 mablae_ joined #git
23:18 Electrom_ joined #git
23:18 thiago joined #git
23:18 eletuchy joined #git
23:19 Eugene jumpman - !reflog
23:19 gitinfo jumpman: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
23:20 eletuch__ joined #git
23:21 Rikai_ joined #git
23:21 Electrom_ joined #git
23:23 nb_bez___ joined #git
23:26 berndj joined #git
23:26 eletuchy joined #git
23:27 yude joined #git
23:28 stantonk joined #git
23:29 eletuchy_ joined #git
23:30 romerocesar joined #git
23:32 eletuchy joined #git
23:33 aidalgol joined #git
23:34 eletuch__ joined #git
23:36 eletuchy_ joined #git
23:36 Hello71 joined #git
23:39 eletuchy joined #git
23:39 moei joined #git
23:39 bdb-me joined #git
23:40 matthiaskrgr two identical files in 2 different git repos will still have the same hash, right?
23:41 EvilPenguin joined #git
23:41 BlaXpirit do files even have a hash?
23:42 sagerdearia joined #git
23:42 kadoban I believe so, or at least their contents does, though it's not exactly exposed in the UI as far as I know.
23:42 eletuchy_ joined #git
23:42 kadoban Well, in the plumbing it likely is somewhere.
23:42 Noldorin joined #git
23:43 matthiaskrgr BlaXpirit: git ls-files -s
23:44 Codfection joined #git
23:44 eletuchy joined #git
23:46 espindola joined #git
23:49 ensyde joined #git
23:52 cdown joined #git
23:52 hlysig joined #git
23:54 mingrammer_ joined #git
23:54 mwhooker joined #git
23:54 zumba_addict joined #git
23:54 grassass joined #git
23:55 psprint_ joined #git
23:56 fahadash joined #git
23:57 rgrinberg joined #git

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