Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-12

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

All times shown according to UTC.

Time Nick Message
00:00 Ph_ joined #git
00:01 mehola joined #git
00:05 zlg joined #git
00:07 zlg If I have a submodule and want to update it, but only to the next tag (let's say the submodule is targeting v1.0 and I only want to update if it's v1.1), how would I do that? Would it be handled within that submodule like I would normally?
00:07 zlg e.g. git pull; git checkout v1.1
00:07 linuxmint joined #git
00:08 zlg Currently I use 'git submodule update' which blindly updates all the submodules
00:09 jaguarmagenta joined #git
00:09 preaction git submodule update moves the submodule to what it is in the supermodule. as far as i know, you're doing it right: go into the submodule and update the commit manually. there's also `git submodule foreach`
00:09 zlg preaction: Okay, that's good news. So then, to make the supermodule remember the commit I moved to I'd use `git submodule sync`?
00:10 preaction no. you use git commit
00:10 zlg Oh, just a normal commit.
00:11 Lvjasha joined #git
00:11 zlg Cool. Thanks for the hint!
00:14 Bmsw joined #git
00:15 inflames joined #git
00:18 WaReZ joined #git
00:20 shgysk8zer0 joined #git
00:20 nnyk_ joined #git
00:21 MattMaker joined #git
00:23 arescorpio joined #git
00:31 dreiss joined #git
00:32 jpg joined #git
00:38 Rodya_ joined #git
00:39 linuxmint joined #git
00:41 mehola joined #git
00:42 cdown_ joined #git
00:43 slappymcfry joined #git
00:44 ciampix joined #git
00:46 DolpheenDream joined #git
00:47 ciampix joined #git
00:47 Schwarzbaer__ joined #git
00:50 ciampix joined #git
00:54 dreiss joined #git
00:54 linuxmint joined #git
01:02 ekinmur joined #git
01:08 SupaHam joined #git
01:08 watabou joined #git
01:08 ceaucari joined #git
01:08 shgysk8zer0 joined #git
01:09 romerocesar joined #git
01:11 fission6 joined #git
01:12 romerocesar joined #git
01:14 drodger joined #git
01:16 inflames joined #git
01:16 fstd_ joined #git
01:16 pks joined #git
01:17 cqi joined #git
01:19 hecliunyx joined #git
01:25 neunon joined #git
01:28 clemf joined #git
01:32 linuxmint joined #git
01:33 neunon joined #git
01:35 Lor_ joined #git
01:35 boombatower joined #git
01:38 SwiftMatt joined #git
01:41 rgrinberg joined #git
01:46 rahtgaz joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and comedy salvation | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git pull a day keeps the conflict's away
01:50 m_antis joined #git
01:54 ncthom91 joined #git
01:54 AustinMatherne joined #git
01:56 liuzhen joined #git
01:56 lf622662 joined #git
01:57 Wulf4 joined #git
02:01 AustinMatherne joined #git
02:05 CEnnis91 joined #git
02:09 texinwien joined #git
02:09 ahr3n joined #git
02:13 jab416171 joined #git
02:15 romerocesar joined #git
02:16 dobbee joined #git
02:20 ncthom91 joined #git
02:21 lvns joined #git
02:22 espindola joined #git
02:23 eletuchy joined #git
02:23 anu1 joined #git
02:24 linuxmint joined #git
02:26 romerocesar joined #git
02:30 spriz joined #git
02:34 eletuchy joined #git
02:34 sentriz joined #git
02:34 david007 joined #git
02:34 phanimah1sh joined #git
02:42 watabou joined #git
02:42 d4rklit3 joined #git
02:43 dreiss joined #git
02:47 linuxmint joined #git
02:49 armyriad joined #git
02:50 eletuchy joined #git
02:50 romerocesar joined #git
02:55 interne7y joined #git
02:56 hexagoxel joined #git
02:56 sweatsuit joined #git
02:58 chachasmooth joined #git
02:59 lvns joined #git
03:01 d4rklit3 joined #git
03:02 PaulCape_ joined #git
03:03 kotk joined #git
03:05 cqi joined #git
03:10 romerocesar joined #git
03:12 lvns joined #git
03:20 ToBeCloud joined #git
03:21 k3rn31 joined #git
03:22 MattMaker joined #git
03:22 justanotheruser joined #git
03:27 PaulCapestany joined #git
03:29 zetab_ joined #git
03:29 sol56 joined #git
03:32 lvns joined #git
03:39 wrouesnel1 joined #git
03:48 howdoi joined #git
03:49 xorox90 joined #git
03:49 eletuchy joined #git
03:54 PaulCape_ joined #git
03:57 wviana_ joined #git
04:01 monoxane joined #git
04:09 k3rn31 joined #git
04:10 lvns joined #git
04:14 jaguarmagenta joined #git
04:14 lvns joined #git
04:15 Lvjasha joined #git
04:15 jaguarmagenta joined #git
04:17 Cabanossi joined #git
04:20 fahadash joined #git
04:21 PaulCapestany joined #git
04:27 gavin joined #git
04:28 fracting joined #git
04:29 lvns joined #git
04:37 nivag joined #git
04:38 noodle joined #git
04:39 lvns joined #git
04:41 harish joined #git
04:44 barteks2x joined #git
04:47 PaulCape_ joined #git
04:47 languitar joined #git
04:47 fracting joined #git
04:53 italoacasas joined #git
04:56 mohabaks joined #git
05:02 jaguarmagenta joined #git
05:05 dmto joined #git
05:05 phaleth joined #git
05:07 liuzhen joined #git
05:13 PaulCapestany joined #git
05:17 sangy joined #git
05:19 lvns joined #git
05:21 KeelOfSteel joined #git
05:22 oaulakh joined #git
05:22 oaulakh how to resume git clone it network drop?
05:23 oaulakh how to resume git clone for large project if network drop?
05:23 oaulakh anyone?????
05:27 liuzhen joined #git
05:29 ojacobson "don't"
05:29 ojacobson if your network is _that_ unreliable, rsync the repo over first and clone it using the rsync'd copy as a reference repository (see man git-clone and look at the --reference argument).
05:29 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
05:29 ojacobson Note that this will imply never, ever deleting the rsync'd copy, but you won't duplicate data
05:30 ojacobson (You can add --dissociate to git-clone to duplicate objects and make it safe to delete the rsync'd copy)
05:34 oaulakh ojacobson, gitinfo ok i didn't understand a bit what you said, will you please help me to resume my clone?
05:35 ojacobson oaulakh: git throws away incomplete clones. Git _can't_ resume a clone.
05:35 ojacobson If this is a recurring problem, you need to use some non-git tools to solve it.
05:35 oaulakh ojacobson, ok so you mean i have to download it again?
05:35 oaulakh ohh man :(
05:35 ojacobson yes, if cloning or fetching fails you start over on the next attempt
05:35 ojacobson git's wire protocol is resume-hostile
05:36 oaulakh ojacobson, well thanks for help :)
05:36 ojacobson PSA: github is down
05:36 ojacobson https://status.github.com/messages
05:37 eletuchy joined #git
05:37 dreiss joined #git
05:38 ajf- joined #git
05:40 PaulCape_ joined #git
05:41 BSaboia joined #git
05:42 oaulakh left #git
05:44 checkItOut joined #git
05:44 BSAlb joined #git
05:52 fscala joined #git
05:55 AfroThundr joined #git
05:56 arooni joined #git
05:57 d0nn1e joined #git
05:57 NeverDie joined #git
05:57 texasmynsted left #git
05:58 slappymcfry joined #git
06:04 NeverDie_ joined #git
06:06 PaulCapestany joined #git
06:14 elastix joined #git
06:18 fracting joined #git
06:18 Guest26 joined #git
06:24 viking0511 joined #git
06:26 lvns joined #git
06:29 rkazak joined #git
06:32 eletuchy joined #git
06:32 PaulCape_ joined #git
06:32 mohabaks joined #git
06:38 MrWoohoo joined #git
06:39 milki ruh roh
06:39 milki 22:59 < gh-status> [Green] Everything operating normally.
06:40 cqi joined #git
06:40 milki im trying to determine how in-sync (numer of repos that are up-to-date) a mirror is compared to the master server. besides just comparing git ls-remote, are there any nice smarter scripts?
06:41 cqi joined #git
06:47 cqi joined #git
06:48 dopesong joined #git
06:49 milki https://git.lysator.liu.se/ols​son/gitolite-mirror-monitoring
06:49 milki huh
06:52 milki ok, this is a bit smarter. generate the state server side
06:58 liuzhen joined #git
07:00 PaulCapestany joined #git
07:07 jagob joined #git
07:13 elementalest joined #git
07:13 elementalest joined #git
07:14 moei joined #git
07:20 nitin joined #git
07:20 khmarbaise joined #git
07:26 PaulCape_ joined #git
07:29 fission6 joined #git
07:30 mehola joined #git
07:30 milki https://www.wandisco.com/git/multisite an enterprise solution to git mirroring o.O
07:30 irco joined #git
07:31 fission6 joined #git
07:31 alanwill joined #git
07:31 eletuchy joined #git
07:33 barteks2x joined #git
07:34 mariuscc joined #git
07:35 watabou joined #git
07:35 mehola joined #git
07:36 mehola joined #git
07:38 pungi-man joined #git
07:39 pungi-man joined #git
07:40 pungi-man joined #git
07:41 pungi-man joined #git
07:41 pungi-man joined #git
07:42 pungi-man_ joined #git
07:43 nitin joined #git
07:43 macivy joined #git
07:43 ochorocho__ joined #git
07:44 infra-red joined #git
07:44 fracting joined #git
07:45 vuoto joined #git
07:46 macivy left #git
07:46 checkItOut joined #git
07:46 circ-user-vFkn9 joined #git
07:53 PaulCapestany joined #git
07:54 vuoto joined #git
07:55 eletuchy joined #git
08:01 ynanm joined #git
08:06 Fijit joined #git
08:06 fracting joined #git
08:07 Psychiatrist joined #git
08:07 tremblerz joined #git
08:08 tremblerz how do I diff between two repositories which are in different folders
08:08 subhojit777 joined #git
08:08 ajf- joined #git
08:09 tremblerz *branch not repo
08:09 grawity "in different folders" in what way?
08:09 infra-red joined #git
08:12 subhojit777 joined #git
08:13 checkItOut joined #git
08:14 subhojit777 joined #git
08:14 jbitdrop joined #git
08:17 subhojit777 joined #git
08:19 PaulCape_ joined #git
08:20 cyan__ joined #git
08:21 phanimahesh joined #git
08:21 skylite joined #git
08:23 infra-re_ joined #git
08:23 subhojit777 joined #git
08:23 jaguarmagenta joined #git
08:24 jon-mac joined #git
08:26 subhojit777 joined #git
08:31 subhojit777 joined #git
08:31 robotroll joined #git
08:32 emPi joined #git
08:32 hhee joined #git
08:34 digidog joined #git
08:35 watabou joined #git
08:36 cyan__ joined #git
08:37 subhojit777 joined #git
08:39 Corneliu joined #git
08:40 pol123456 joined #git
08:43 romerocesar joined #git
08:44 cdown joined #git
08:46 PaulCapestany joined #git
08:47 eletuchy joined #git
08:48 m0viefreak joined #git
08:50 davisonio joined #git
08:55 infra-red joined #git
08:55 shgysk8zer0 joined #git
08:58 checkItO1t joined #git
09:08 Sasazuka joined #git
09:12 cbreak git branch a b
09:12 cbreak sorry, git diff a b of course
09:12 PaulCape_ joined #git
09:12 shinnya joined #git
09:13 stuh84 joined #git
09:14 romerocesar joined #git
09:16 nitin joined #git
09:17 catsup joined #git
09:17 mase-tech joined #git
09:22 zeroed joined #git
09:24 romerocesar joined #git
09:26 slappymcfry joined #git
09:28 ochorocho__ joined #git
09:33 ahmedelgabri joined #git
09:33 cdown joined #git
09:33 nilsi joined #git
09:33 radsy joined #git
09:36 vuoto joined #git
09:37 vuoto_ joined #git
09:37 mdw joined #git
09:38 qwerty123 joined #git
09:39 j416 getting old and whimsy cbreak
09:39 PaulCapestany joined #git
09:39 keltvek joined #git
09:40 cbreak nah... just sleepy still
09:41 qwerty123 left #git
09:43 toogley joined #git
09:43 catsup joined #git
09:44 pungi-man joined #git
09:44 pol123456 joined #git
09:45 vuoto joined #git
09:47 vuoto joined #git
09:49 Balliad joined #git
09:50 nwkj86 joined #git
09:50 Li joined #git
09:51 cdown joined #git
09:51 Li I don't know how exactly to go about changing the copy of one of the files which I've added into the last commit.
09:51 armyriad joined #git
09:52 vuoto joined #git
09:53 jhass did you push that commit already anywhere?
09:54 vuoto joined #git
09:54 Li in other words is it possible just to sync a newer changes of a file into its copy which has been added into the last commit.
09:54 Li jhass: no .. I work on local repo
09:55 jhass Li: then just make the changes, git add them and run git commit --amend
09:58 vuoto joined #git
09:58 zetab__ joined #git
09:59 Mikaela joined #git
09:59 Balliad joined #git
09:59 zincrokx joined #git
10:00 cyan__ joined #git
10:01 vuoto joined #git
10:02 mniip joined #git
10:02 GT joined #git
10:03 vuoto joined #git
10:03 Li I got it .. thanks jhass
10:03 leeN joined #git
10:04 vuoto joined #git
10:04 fscala joined #git
10:05 romerocesar joined #git
10:05 PaulCape_ joined #git
10:07 ravenzz joined #git
10:07 hiennaj joined #git
10:08 ChoHag joined #git
10:14 hiennaj joined #git
10:15 zincrokx joined #git
10:18 hiennaj joined #git
10:20 Balliad joined #git
10:21 nidr0x joined #git
10:23 raijin joined #git
10:23 anu0 joined #git
10:24 jaguarmagenta joined #git
10:29 ochorocho__ joined #git
10:31 PaulCapestany joined #git
10:32 mase-tech joined #git
10:33 Acorn joined #git
10:33 ahmedelgabri joined #git
10:34 ochorocho__ joined #git
10:40 Ciblia left #git
10:41 Ciblia joined #git
10:41 Dro joined #git
10:42 cdown joined #git
10:42 armyriad joined #git
10:43 McNozes joined #git
10:44 Xethron joined #git
10:46 nitin joined #git
10:50 infra-red joined #git
10:51 emPi joined #git
10:54 watabou joined #git
10:56 PCatinean joined #git
10:57 heroux joined #git
10:57 paul424 joined #git
10:58 PaulCape_ joined #git
11:02 Domhack joined #git
11:02 Balliad joined #git
11:04 interne7y joined #git
11:09 nwkj86 joined #git
11:10 alokbeniwal joined #git
11:10 Gloomy joined #git
11:11 weckl joined #git
11:18 linuxmint joined #git
11:18 wviana joined #git
11:19 cdown joined #git
11:20 davisonio joined #git
11:23 glebihan joined #git
11:24 PaulCapestany joined #git
11:29 Balliad joined #git
11:29 rahtgaz joined #git
11:29 geoid joined #git
11:30 ochorocho__ joined #git
11:34 dan2k3k4 joined #git
11:34 heroux_ joined #git
11:35 texinwien joined #git
11:35 romerocesar joined #git
11:36 sdothum joined #git
11:39 Balliad joined #git
11:40 ays joined #git
11:45 romerocesar joined #git
11:46 infra-red joined #git
11:49 aswen joined #git
11:51 PaulCape_ joined #git
11:51 m0viefreak joined #git
11:55 watabou joined #git
11:55 romerocesar joined #git
12:01 boudicca joined #git
12:05 AlexRussia joined #git
12:06 romerocesar joined #git
12:07 davisonio joined #git
12:09 Jackneill joined #git
12:10 phanimahesh !bored
12:10 yude_ joined #git
12:10 phanimahesh Nothing triggers?
12:10 * phanimahesh disappointed.
12:11 _ikke_ !botsnack
12:11 gitinfo Om nom nom
12:14 dranve joined #git
12:14 cbreak joined #git
12:14 phanimahesh o.O
12:15 phanimahesh !omnomnom
12:15 jast !pizza
12:15 gitinfo If a pizza has a radius 'z' and a depth 'a' that pizza's volume can be defined Pi*z*z*a
12:15 phanimahesh we need a chain of triggers, each returning the next while still being meaningful.
12:15 jast !ping
12:15 gitinfo I only respond to !reply_time
12:15 jast that one should keep you busy for a few days ;)
12:15 phanimahesh !reply_time
12:15 gitinfo I only respond to !ECHO-REQUEST
12:16 phanimahesh !ECHO-REQUEST
12:16 gitinfo I only respond to !ping
12:16 phanimahesh hahahah. Cool.
12:16 grawity !pony
12:16 grawity !triggers
12:16 gitinfo Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
12:16 Sleepy63 My triggers for this channel: [UTILITY: !time and !utc]
12:16 gitinfo [!reply_time] I only respond to !ECHO-REQUEST
12:16 jast uh-oh, unauthorized bot detected :)
12:17 phanimahesh !time
12:17 gitinfo [!reply_time] I only respond to !ECHO-REQUEST
12:17 Sleepy63 [ CDT: Fri 2016-06-10 10:49:40 ] -- [ UTC: Fri 2016-06-10 15:49:40 ]
12:17 grawity !adventure_time
12:17 jast fortunately they're not getting in a bot loop
12:17 jast .random
12:17 gitinfo Want to see a neat effect? Watch http://www.youtube.com/watch?v=0JVJsPpg1-8 -- ideally in fullscreen. when looking away at the end, look at your hand. I promise this is not a shock video. [16]
12:17 ochorocho__ joined #git
12:17 GavinMagnus joined #git
12:18 PaulCapestany joined #git
12:25 jaguarmagenta joined #git
12:27 tehtraveler2321 joined #git
12:30 SimonNa joined #git
12:35 ahmedelgabri joined #git
12:35 dan2k3k4 joined #git
12:38 dan2k3k4 joined #git
12:38 cdown_ joined #git
12:40 GavinMagnus left #git
12:41 rahtgaz joined #git
12:45 nilsi joined #git
12:45 PaulCape_ joined #git
12:46 k3rn31 joined #git
12:46 boudiccas joined #git
12:48 jophish__ joined #git
12:49 eijk joined #git
12:50 raijin joined #git
12:54 skunkz joined #git
12:56 docnvk joined #git
12:56 romerocesar joined #git
12:57 watabou joined #git
13:00 davisonio joined #git
13:00 nilsi_ joined #git
13:02 santa-fire joined #git
13:03 Oebele joined #git
13:03 dEPy joined #git
13:04 infra-red joined #git
13:05 AlexRussia joined #git
13:06 DolpheenDream joined #git
13:08 nitin joined #git
13:08 SwiftMatt joined #git
13:09 cdown_ joined #git
13:09 nilsi joined #git
13:11 PaulCapestany joined #git
13:12 yude joined #git
13:13 JanC joined #git
13:13 hpfmn joined #git
13:13 dan2k3k4 joined #git
13:17 nidr0x joined #git
13:22 aavrug joined #git
13:24 hpfmn joined #git
13:24 aavrug_ joined #git
13:25 dan2k3k4 joined #git
13:27 lf622662 joined #git
13:27 jost joined #git
13:28 lolmac joined #git
13:29 aavrug__ joined #git
13:29 nidr0x joined #git
13:29 espindola joined #git
13:29 mmlb joined #git
13:30 inflames joined #git
13:31 isxek joined #git
13:33 CtrlC joined #git
13:33 mdw_ joined #git
13:34 pabs3 joined #git
13:34 pabs3 can git notes be OpenPGP-signed?
13:34 CtrlC I have some unstaged changes and I want to remove the last commit totally from the repo including from the log. I tried git reset --soft HEAD~1 so the changes are back. but how to remove it from the log?
13:35 osse CtrlC: if you do that then they are removed from the log
13:35 osse for that branch
13:35 danieli joined #git
13:35 CtrlC osse: I can see it using "git log"
13:36 osse CtrlC: plain git log? no git log --all or git log --branches or ... ?
13:36 CtrlC plain. I tried one more time and seems to be removed now. thank you osse.
13:37 PaulCape_ joined #git
13:38 dan2k3k4 joined #git
13:39 ronny joined #git
13:40 nidr0x joined #git
13:40 osse huh
13:41 Guest18548 left #git
13:42 ronnq joined #git
13:43 Psych joined #git
13:43 Abe joined #git
13:45 nitin joined #git
13:46 bluehunter90 joined #git
13:47 bluehunter90 Hi everyone
13:47 gitinfo bluehunter90: 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.
13:47 bluehunter90 I want to contibute to git
13:51 Psychiatrist joined #git
13:52 raijin joined #git
13:53 nidr0x joined #git
13:55 madewokherd joined #git
13:55 espindola joined #git
13:55 pabs3 left #git
13:57 dan2k3k4 joined #git
13:57 romerocesar joined #git
13:58 lolmac joined #git
14:03 ppfic joined #git
14:04 PaulCapestany joined #git
14:06 nnyk_ joined #git
14:07 nidr0x joined #git
14:08 jost_ joined #git
14:10 fission6 joined #git
14:12 GandalfTheWizard joined #git
14:12 LeMike joined #git
14:13 cqi joined #git
14:13 raijin joined #git
14:13 phanimahesh !contributing
14:13 gitinfo Want to improve git? Everything you need to know is in http://git.io/SubmittingPatches. See !list for more on the mailing list
14:14 phanimahesh bluehunter90: ^
14:14 TheMontyChrist joined #git
14:15 infra-red joined #git
14:15 mmlb joined #git
14:15 TheMontyChrist joined #git
14:15 TheMontyChrist joined #git
14:16 TheMontyChrist some one told me something happens when I "git checkout <remote>/<branch>"
14:16 fahadash joined #git
14:16 jhass yes that right, something happens and be it that you're informed it already happened
14:17 dan2k3k4 joined #git
14:17 fscala joined #git
14:17 TheMontyChrist_ joined #git
14:17 TheMontyChrist_ joined #git
14:17 TheMontyChrist_ joined #git
14:17 TheMontyChrist_ test
14:18 jhass TheMontyChrist_: worked
14:18 TheMontyChrist_ it was something to the effect of "remote HEAD" or something
14:18 TheMontyChrist_ is this a problem?
14:18 jhass no it does not affect the remote HEAD
14:18 TheMontyChrist_ I'm trying to understand checkout from the POV of a mercurial user
14:19 jhass TheMontyChrist_: if you want to work on a remote branch you should create a local branch that tracks it
14:19 TheMontyChrist_ to me, I should be able to checkout <remote>/<branch> hackaway, commit, push
14:19 AaronMT joined #git
14:19 TheMontyChrist_ wait
14:19 jhass no
14:19 TheMontyChrist_ something isn't quite right about that
14:19 osse !detached
14:19 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
14:19 TheMontyChrist_ <remote>/<branch> isn't even mine
14:19 AaronMT joined #git
14:20 jhass git checkout -b -t <branch> <remote>/<branch> or on recent git versions just git checkout <branch>
14:20 nidr0x joined #git
14:21 TheMontyChrist_ but our wiki says "git checkout dist/stable"
14:21 TheMontyChrist_ then "git checkout -b '' "
14:21 TheMontyChrist_ can you explain what is happening?
14:21 jhass your wiki is wrong/unnecessarily complicated
14:21 TheMontyChrist_ nothing I can do about that
14:22 jhass well you don't have to follow the steps to achieve the same
14:22 TheMontyChrist_ to me, the first command makes dist/stable a working copy on my machine
14:22 TheMontyChrist_ dist - is remote btw
14:22 jhass so your local repo has a HEAD reference, it can either point to a branch (and then is a so called symbolic ref) or to a commit directly
14:22 bluehunter90 !contributing
14:22 gitinfo Want to improve git? Everything you need to know is in http://git.io/SubmittingPatches. See !list for more on the mailing list
14:23 jhass HEAD defines the parent commit for when you commit
14:23 jhass a branch is nothing but movable name/reference to a commit
14:24 TheMontyChrist_ isn't there a HEAD per branch?
14:24 jhass so if HEAD points to a branch, and you commit, then simply the branch is moved to the new commit
14:24 jhass no, one per repo
14:24 jhass _local repo_
14:24 jhass now you don't want a remote branch to move if you commit, that should only happen on git push
14:25 jhass hence you can't point HEAD to a remote branch
14:25 jhass if you git checkout remote/branch, then HEAD will point at the same commit as remote/branch
14:25 jhass and not be a symbolic ref
14:25 jhass if you then commit, HEAD moves, but there's no branch pointing to your new commit
14:26 jaguarmagenta joined #git
14:26 jhass hence if you then checkout (move HEAD) to something else, you get a dangling commit which you can potentially move
14:26 jhass remote/branch didn't move so git checkout remote/branch goes back to the same commit as initially
14:26 jhass hence -> always create a local branch
14:26 Ahmed90 joined #git
14:27 jhass I showed the general form and the convenient form on how to do so above
14:27 vuoto joined #git
14:28 TheMontyChrist_ I'm thinking learning mercurial really tripped me up
14:28 TheMontyChrist_ your notion of HEAD vs hg is different.  your HEAD sounds like a TIP
14:28 TheMontyChrist_ in mercurial speak
14:28 TheMontyChrist_ I'm litterally trying to fit a square peg thru a round hole
14:28 netj_ joined #git
14:28 Khisanth joined #git
14:28 TheMontyChrist_ okay, in mercural a tip is the very last revision or highest revision #
14:29 TheMontyChrist_ there's only ever 1
14:30 TheMontyChrist_ even then, your HEAD isn't quite a tip :P
14:30 TheMontyChrist_ so HEAD is just a pointer to a revision?
14:30 PaulCape_ joined #git
14:30 jhass it is either a pointer to a revision or a symbolic ref, a pointer to a pointer
14:31 TheMontyChrist_ I'm going to take notes one sec.
14:31 nidr0x joined #git
14:37 TheMontyChrist joined #git
14:37 TheMontyChrist I'm sorry
14:38 TheMontyChrist freenode webchat kept dropping
14:38 TheMontyChrist just installed pidgin
14:38 TheMontyChrist much better
14:38 TheMontyChrist so what's the latest revision on a branch called?
14:38 lordjancso joined #git
14:39 rahtgaz joined #git
14:39 TheMontyChrist when I check out, I move my HEAD to a revision (and my working directory should get updated to reflect this..)
14:39 sdam joined #git
14:40 TheMontyChrist okay, TIL mercurial HEAD != git HEAD
14:40 bluehunter90 I'd like to understand the concept of branches
14:40 aavrug joined #git
14:40 TheMontyChrist git HEAD really means current location
14:40 osse !HEAD
14:40 gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
14:41 TheMontyChrist Yes, I've stumbled to that conclusion
14:41 aavrug joined #git
14:42 TheMontyChrist so how can I check out the latest revision of a branch?
14:42 ekinmur joined #git
14:42 TheMontyChrist git checkout branch <- always takes me to the latest?
14:42 osse yes
14:43 jhass note that it also always takes you to a local branch
14:43 jhass you might need to pull in or rebase against a remote branch
14:43 jhass which you can update with git fetch
14:43 jhass (git pull does git fetch implicitly)
14:43 TheMontyChrist so git checkout <remote>/<branch> I'd be "detached" head?
14:44 jhass yes because as I explained HEAD can't point to the branch itself but only to the revision given through it
14:44 jhass say you do git checkout master, then you have HEAD -> master -> <sha>
14:44 fscala joined #git
14:45 jhass when you do git checkout remote/branch you have HEAD -> <sha> directly
14:45 TheMontyChrist <sha> is what?
14:45 jhass in the former case, when you git commit, what HEAD points to is updated, in the latter case only HEAD itself is updated
14:45 jhass a commit id
14:46 jhass every object in git is canonically referenced through its SHA1 sum
14:51 cdown_ joined #git
14:52 TheMontyChrist '''git checkout dist/stable''''''git checkout -b '''
14:52 TheMontyChrist I know you think it's bad, but unfortunately that's how my team rolls
14:52 CheckDavid joined #git
14:52 TheMontyChrist so the first statement I'll have a detached head pointing to stable
14:52 TheMontyChrist the second, I'm not so clear about
14:52 jhass TheMontyChrist: there's no technical difference to git checkout -b new_name dist/stable
14:53 jhass it's the exact same end result
14:53 TheMontyChrist so I'm branching dist/stable
14:53 TheMontyChrist called ''
14:53 jhass git checkout -b creates a new local branch and switches to it at the same time
14:54 jhass git checkout -b name without a second argument just uses HEAD as the base
14:54 aavrug_ joined #git
14:55 TheMontyChrist "Prior to submitting your feature branch for review (and optionally whenever dist/stable is updated)*, rebase your feature branch from the most recent dist/stable branch: This will ensure that your code keeps up to date with repository changes, which will provide your branch with the latest updates, encourage early resolution to existing conflicts, and minimize the potential for future conflicts"
14:55 ochorocho__ joined #git
14:55 TheMontyChrist git checkout and then git rebase dist/stable
14:55 TheMontyChrist what does checkout do in this case?
14:55 jhass yes, though you should git fetch first
14:55 TheMontyChrist okay
14:55 jhass I'm pretty sure they mean git checkout your_branch_name
14:56 jhass which makes sure you switched to (HEAD points to) your local branch
14:56 aavrug_ joined #git
14:57 TheMontyChrist what if I skip "git checkout"?
14:57 TheMontyChrist and go direct to dist/stable
14:57 TheMontyChrist before you answer that...
14:57 TheMontyChrist git fetch (I'm pressuming this is the same as a mercurial pull) shouldn't change anything in my working copy.  Just the internal repo is updated
14:57 jhass yes
14:57 PaulCapestany joined #git
14:58 TheMontyChrist I'm still working in my branch (call it "newbranch" rather than '')
14:58 TheMontyChrist why can't I just rebas dist/stable?
14:58 TheMontyChrist and skip the checkout?
14:59 TheMontyChrist I need to think about this :P
14:59 jhass you can, the checkout in their guide just guards against mistakes
14:59 jhass it's a noop if you're already on the target branch
14:59 aavrug_ left #git
14:59 watabou joined #git
15:00 jhass btw there's again shortcuts to it here, git pull --rebase dist stable would fetch and rebase your local branch in one step
15:00 Psychiatrist joined #git
15:00 son_ joined #git
15:00 jhass *your current local branch, I should emphasize
15:00 TheMontyChrist since I branched off of dist/stable.  rebasing, to inject all changes made to dist/stable before all the commits that I made on my new branch
15:01 TheMontyChrist rebasing, should <- is what I mean
15:01 TheMontyChrist is this correct?
15:02 CEnnis91 joined #git
15:02 jhass yes that's one viewpoint
15:02 TheMontyChrist so if I branched, and A, B, C, D, E,F commits were added to dist stable, A, B, C, D, E, F should now appear before any of the commits I made to my new branch
15:02 jhass yes
15:02 rgrinberg joined #git
15:02 jhass another way to think about is, that it's reapplying the patches your commits consist of ontop of the given target
15:03 Abhishek joined #git
15:03 jhass the important takeaway is that your commits will be new commits, they will be remade
15:04 GavinMagnus joined #git
15:04 polyzen like a phoenix from its ashes
15:04 jhass since sha of a commits parent goes into the data for its own sha
15:04 TheMontyChrist does git have a pull command?
15:04 TheMontyChrist I see there's git push dist
15:04 polyzen wat
15:04 jhass TheMontyChrist: sometimes I wonder if you even read all I wrote...
15:04 TheMontyChrist well if there is, I need to differentiate between a pull and a fetch
15:05 paul424 joined #git
15:05 jhass git pull is either git fetch + git merge or with the --rebase flag git fetch + git rebase
15:05 jhass I already mentioned that
15:06 cgks joined #git
15:06 TheMontyChrist TIL git pull != mercural pull :P
15:06 cyan___ joined #git
15:07 TheMontyChrist I think once the terms get untangled things aren't so bad
15:07 TheMontyChrist if I forgot what you said, I apologize
15:07 TheMontyChrist freenode webchat is hosed
15:07 TheMontyChrist and I don't have the logs
15:07 TheMontyChrist to refer back to
15:07 grawity also git commits != mercurial commits
15:07 TheMontyChrist I'm using pidgin now, so it shouldn't be so bad
15:07 grawity er, I meant branches
15:07 grawity in a way, the opposite of mercurial branches
15:07 jhass I mentioned git pull --rebase after you switched to pidgin
15:08 TheMontyChrist sorry then
15:11 TheMontyChrist suppose I branch off of "A", call this "B".  If I'm "B" and I rebase off of "C" what would happen?
15:11 nidr0x joined #git
15:12 TheMontyChrist rebasing "A" would only inject changed to "A" on "B"
15:12 blackwind_123 joined #git
15:12 TheMontyChrist what if it's completely unrelated
15:12 TheMontyChrist nvm
15:12 TheMontyChrist I need to worry about other stuff :P
15:12 TheMontyChrist more important stuff...
15:12 italoacasas joined #git
15:13 TheMontyChrist so I'm thinking you're right
15:13 TheMontyChrist the wiki seems a little clunky
15:14 TheMontyChrist it mentions nothing about fetching or pulling
15:14 Psychiatrist joined #git
15:14 sebhoss_ joined #git
15:14 TheMontyChrist just "rebase".  The whole point of that excercise was to make sure you're building atop all the fresh changes to the branch you split from.
15:14 dcg joined #git
15:15 TheMontyChrist thanks all
15:15 TheMontyChrist learned alot
15:15 TheMontyChrist much confusion has been cleared
15:15 i7c Much return key has been pressed.
15:15 TheMontyChrist the remote branch thing is interesting.
15:16 jhass TheMontyChrist: to answer the question anyway, the fact that you branched of of A would be irrelevant, git searches for the first common ancestor between C and B, then takes all commits on B after it an reapplies them on C
15:16 jhass *and
15:16 jhass and the result would become your new B
15:16 adante joined #git
15:18 m0viefreak joined #git
15:19 ribasushi joined #git
15:20 weylin joined #git
15:20 Oebele joined #git
15:23 alee joined #git
15:24 PaulCape_ joined #git
15:24 khmarbaise joined #git
15:26 AlexRussia joined #git
15:26 YMQNOcHt2Bxj joined #git
15:26 YMQNOcHt2Bxj joined #git
15:26 YMQNOcHt2Bxj left #git
15:27 Migzt joined #git
15:27 dreiss joined #git
15:27 nidr0x joined #git
15:27 hashpuppy joined #git
15:30 doktori joined #git
15:31 Grimm_ joined #git
15:33 devster31 how can I clone an svn repo such as this: https://themes.svn.wordpress.org/awaken/ using git-svn but transforming each folder in a tag ? I'm not sure it's even possible
15:35 tref joined #git
15:36 dan2k3k4 joined #git
15:37 ekinmur joined #git
15:38 nilsi_ joined #git
15:41 raijin joined #git
15:41 TheMontyChrist let me see if I'm deciphering this: git push origin master.  push changes in master branch to remote called "origin"
15:42 TheMontyChrist It wouldn't seem, but this command doesn't matter what HEAD is pointing at?
15:45 Rodya_ joined #git
15:46 TheMontyChrist I'm not used to cherry picking what gets pushed on a push
15:46 TheMontyChrist hg push - both repos are synched
15:50 DARSCODE joined #git
15:50 PaulCapestany joined #git
15:51 DolpheenDream joined #git
15:51 ceaucari joined #git
15:52 Impaloo joined #git
15:52 Impaloo joined #git
15:53 osse TheMontyChrist: correct, HEAD doesn't matter
15:53 osse TheMontyChrist: if you just type 'git push' then it might matter. It's configurable
15:57 ahmedelgabri joined #git
15:57 Rodya_ joined #git
16:00 watabou joined #git
16:03 k3rn31 joined #git
16:10 dan2k3k4 joined #git
16:11 mmlb joined #git
16:11 Rodya_ joined #git
16:13 Rodya_ joined #git
16:13 xfbs joined #git
16:15 xfbs joined #git
16:15 paul424 joined #git
16:17 PaulCape_ joined #git
16:17 bilb_ono joined #git
16:18 tomog999_ joined #git
16:19 bilb_ono what does it mean when I see copied:    load.py -> populate_h5.py
16:19 bilb_ono I want to add it, not copy it. I do git add populate_h5.py
16:23 osse bilb_ono: it means the files are so similar that git says you copied it
16:23 osse it doesn't mean anything
16:25 bilb_ono osse: so I have added it basically?
16:25 osse yes
16:25 osse everything is fine
16:25 bilb_ono strange because they aren't that similar
16:25 bilb_ono ok
16:25 osse information like renamed/moved/copied are based on heuristics
16:26 Rodya_ joined #git
16:26 jaguarmagenta joined #git
16:26 m8 joined #git
16:27 van joined #git
16:30 dan2k3k4 joined #git
16:30 BombStrike joined #git
16:31 exxi_ joined #git
16:32 liuzhen joined #git
16:32 jeffreylevesque joined #git
16:34 fees joined #git
16:37 fahadash joined #git
16:38 mdw joined #git
16:38 todd_dsm_ joined #git
16:40 ciampix joined #git
16:40 heroux joined #git
16:41 Ediz joined #git
16:43 yude joined #git
16:45 vuoto joined #git
16:46 son_ joined #git
16:48 son_ left #git
16:48 romerocesar joined #git
16:50 son joined #git
16:50 infra-red joined #git
16:51 nitin joined #git
16:52 dreiss joined #git
16:53 khmarbaise joined #git
16:53 cbreak bilb_ono: they probably contain a lot of the same content
16:53 cbreak enough to surpass your copy similarity threshold
16:53 cbreak see the -C option in man git-diff
16:53 gitinfo the git-diff manpage is available at http://jk.gs/git-diff.html
16:54 davisonio joined #git
16:57 Goplat joined #git
16:57 TheMontyChrist made a change to a file
16:57 Guest57418 joined #git
16:57 TheMontyChrist would like to return it back to its original state
16:57 TheMontyChrist how is this done?
16:57 osse git status tells you how
17:00 TheMontyChrist I have master, and ssd (a branch of master) with no commits
17:00 TheMontyChrist git checkout ssd
17:00 cbreak TheMontyChrist: branches without commits can not exist
17:00 TheMontyChrist oh.
17:00 cbreak TheMontyChrist: git checkout -- file
17:00 TheMontyChrist what that explains it
17:00 cbreak that'll check out file from the index
17:01 TheMontyChrist what happened was that I was in ssd, modified a make file.  git checkout master.  and it complained that the Makefile was modified
17:01 cbreak or git checkout HEAD -- file, or git checkout branchname -- file to check it out from that branch
17:01 TheMontyChrist even though the intention was to toss it makefile change.
17:01 cbreak or use -p to check out patches from the file instead of everything
17:01 watabou joined #git
17:01 cbreak TheMontyChrist: changes are not on a branch until they are committed
17:01 mdw joined #git
17:01 TheMontyChrist so, since ssd has no commits, ssd is seen as just "master" ?
17:01 cbreak TheMontyChrist: then it has commits
17:01 cbreak those from masater
17:01 cbreak you probably branched off ssd from master
17:02 rahtgaz joined #git
17:02 rkazak joined #git
17:02 TheMontyChrist yes, I created a branch off of master called ssd
17:02 cbreak remember, branches are only labels. The label "branch" points to a commit, the newest of that branch
17:02 TheMontyChrist I checked it out.  make changes to a make file, decided I didn't like it and then just checked out master.
17:02 TheMontyChrist I was expecting a pristine "master" but it said I modifed a Makefile.
17:03 cbreak TheMontyChrist: your changes are in the working dir
17:03 cbreak they are not on a branch
17:03 cbreak switching branches will not affect your changes
17:03 cbreak they are safely preserved by git
17:03 cbreak to remove the changes, do what I told you above
17:03 TheMontyChrist sorry, I'm slow, I'm wrapping my head around git still
17:04 TheMontyChrist if I create a branch off of master called ssd and make changes (but don't) commit.  what does it mean then when I git checkout master?
17:04 TheMontyChrist shouldn't the working copy relfect an unchanged Makefile?
17:04 TheMontyChrist make changes->change a Makefile
17:04 SimonNaa joined #git
17:05 TheMontyChrist branch off "master" called ssd.  check ssd out and then....
17:05 TheMontyChrist I would expect checking out master would show an unchanged make file.
17:05 preaction no. git checkout <commitish> is different from git checkout <file>. if checking out the branch does not require changes to the file, it will be fine. git doesn't like just throwing away changes unless you explicitly tell it to
17:05 romerocesar joined #git
17:05 cbreak TheMontyChrist: as I said above
17:05 cbreak the changes you make remain
17:06 liuzhen joined #git
17:06 cbreak TheMontyChrist: your changes are in the working directory
17:06 TheMontyChrist one sec.  I'm going to do an experiment
17:06 TheMontyChrist right now, things are "reverted" and git status give me clean bill of health
17:07 TheMontyChrist in "master".  I'm going to switch to "ssd", a new branch of "master"
17:07 DolpheenDream joined #git
17:08 TheMontyChrist just made a change to the working directory and the njust did a git checkout master.
17:08 TheMontyChrist whoa.  the change in the make file still appears
17:08 cbreak of course
17:08 cbreak git doesn't just lose changes
17:09 cbreak it'd be quite crappy if you could accidentally lose work with git like that :)
17:09 LeMike joined #git
17:09 TheMontyChrist so when I checkout something how can I force my working diretory to be *exactly* what's in the repo?
17:09 preaction if master had moved on from ssd, and it made changes to the makefile, then you wouldn't be able to check out master with a dirty makefile
17:09 TheMontyChrist preaction: thank.  I was starting to get that impression
17:09 preaction git checkout .; git checkout master
17:09 TheMontyChrist so at the moment, master and ssd are pointing to the same revision
17:09 TheMontyChrist if ssd was newly branched
17:10 cbreak TheMontyChrist: as I said above, a few times
17:10 cbreak git checkout in file mode
17:10 TheMontyChrist so if master moved on and then I checked it out, sounds like your saying git will complain or mention that I have uncommitted changes or something to that effect.
17:10 TheMontyChrist I'll have to google commitish and file mode
17:10 cbreak TheMontyChrist: git will only complain if the files that have local changes also need to be changed for branch switching
17:11 mariuscc joined #git
17:11 cbreak TheMontyChrist: just read man git-checkout
17:11 gitinfo TheMontyChrist: the git-checkout manpage is available at http://jk.gs/git-checkout.html
17:12 watabou joined #git
17:12 TheMontyChrist wrt to mercurial, as soon as I branch, make a change on that branch - don't commit - and then switch back to the parent.  my changes are blown away
17:13 cbreak TheMontyChrist: sounds dumb
17:13 cbreak TheMontyChrist: well, with git you don't have to worry
17:13 cbreak your changes are safe
17:14 TheMontyChrist it's just different
17:14 cbreak TheMontyChrist: if you notice you're on the wrong branch, you can just switch and commit them there
17:14 TheMontyChrist from my pov, when I tell my scm to go to a branch, my working copy should be *exactly* like that in the repo
17:14 kpease joined #git
17:14 dan2k3k4 joined #git
17:14 cbreak if you have made changes and want to make a branch to commit them, just make the branch, switch to it and commit them there
17:14 cbreak no worrying that your changes are lost by switching
17:15 TheMontyChrist again, from my pov, I actually like the fact data is lost by switching.
17:15 osse TheMontyChrist: in that case you can use checkout -f
17:15 bremner TheMontyChrist: typical everyone's point of view is informed by what they are used to
17:15 cbreak TheMontyChrist: then don't use git checkout
17:15 TheMontyChrist I have to unlearn mercurial
17:15 cbreak use git checkout branchname && git checkout branchname .
17:15 cbreak that'll nuke your changes away
17:15 preaction how is data lost by switching? you can't switch back
17:16 TheMontyChrist TIL git checkout != hg update
17:16 CheckDavid joined #git
17:16 TheMontyChrist ..that'd be its equiv
17:17 TheMontyChrist when I tell it to go to a revision, my working directory is in sync w/ repo.  so if I made any local changes it's blown away such that my working copy is an exact clone of what's in the repo
17:17 TheMontyChrist it's just different.
17:17 lvns joined #git
17:18 osse you're contradicting yourself
17:18 osse either your working directory is in sync, or you have local changes.
17:18 osse you can't have both
17:18 osse as far as git is concerned
17:18 TheMontyChrist indeed
17:18 mdw joined #git
17:20 odigem joined #git
17:20 odigem hi
17:20 TheMontyChrist I was commenting on behavior when you switch when do have uncommitted changes
17:21 TheMontyChrist it wasn't what I was expecting
17:21 odigem how to add forlder to git but skip files in folder?
17:21 jhass odigem: you can't, git only tracks files, not folders
17:21 dopesong joined #git
17:21 jhass odigem: you have to at least add a dummy file in the folder
17:21 jhass for example a .gitignore that ignores all files within the folder ;)
17:22 odigem i create .gitignore in this folder
17:22 odigem but my dir in main .gitignore
17:22 odigem need create rule for eech file ? O.o
17:22 odigem each*
17:23 Dyonisos joined #git
17:23 odigem !.gitignore
17:23 osse odigem: no. you just have to have a file in that dir
17:23 osse .gitignore is a suggestion for what file to put there
17:23 TheMontyChrist yeah, hg update = git checkout -f :P
17:24 jhass osse: you can git add -f dir/.gitignore
17:24 jhass eh
17:24 sangy joined #git
17:24 jhass odigem: ^
17:24 TheMontyChrist or therearbouts
17:24 jhass -f ignores .gitignore
17:25 diegoviola joined #git
17:26 TomyLobo joined #git
17:27 hecliunyx joined #git
17:31 van joined #git
17:31 son joined #git
17:32 Spacew00t joined #git
17:33 davisonio joined #git
17:34 AstroMuffin joined #git
17:35 k3rn31 joined #git
17:38 AstroMuffin joined #git
17:39 ciampix joined #git
17:39 shgysk8zer0 joined #git
17:39 mischat joined #git
17:43 AstroMuffin_ joined #git
17:44 mdw_ joined #git
17:45 Rodya_ joined #git
17:45 stuh84 joined #git
17:46 rgrinberg joined #git
17:48 infra-re_ joined #git
17:49 boudicca joined #git
17:49 AstroMuffin joined #git
17:50 Peuc joined #git
17:50 TheMontyChrist just woud like to double check
17:52 TheMontyChrist ssd is a branch of dist/stable.  I "git fetch dist/stable" & git rebase dist/stable (while ssd is checked out).  It will effectively prepend any changes to dist/stable to my ssd branch?
17:52 jaguarmagenta joined #git
17:54 dave0x6d joined #git
17:55 shgysk8zer0 joined #git
17:56 shgysk8zer0 joined #git
17:58 yude joined #git
18:00 polyzen left #git
18:02 vuoto joined #git
18:03 clemf joined #git
18:03 geoid joined #git
18:04 xfbs joined #git
18:05 fission6 joined #git
18:09 roflincopter joined #git
18:09 Winter_ joined #git
18:12 son joined #git
18:12 raindev joined #git
18:13 mikecmpbll joined #git
18:17 son_ joined #git
18:18 ahmedelgabri joined #git
18:18 Raging_Hog joined #git
18:20 mischat joined #git
18:23 anu1 joined #git
18:27 cdown_ joined #git
18:30 dan2k3k4 joined #git
18:30 lvns joined #git
18:33 mariuscc joined #git
18:34 aard_ joined #git
18:36 espindola joined #git
18:38 Guest89 joined #git
18:38 Froziph joined #git
18:38 Guest89 left #git
18:42 multi_io joined #git
18:46 circ-user-GW4fr joined #git
18:47 ahmedelgabri joined #git
18:48 quetz joined #git
18:49 vuoto joined #git
18:52 yqt joined #git
18:55 Eugene TheMontyChrist - other way round: it takes your ssd banch and transplants it onto dist/stable.
18:56 Eugene ssd branch will be at the new point; dist/stable remains unchanged
18:58 son_ joined #git
18:59 son joined #git
18:59 paul424 joined #git
19:06 Epmu joined #git
19:07 vuoto_ joined #git
19:07 Balliad joined #git
19:09 interne7y joined #git
19:09 acetakwas joined #git
19:13 Rodya_ joined #git
19:14 ediz_ joined #git
19:18 Xnqm joined #git
19:22 mdw joined #git
19:22 AlexRussia joined #git
19:26 geoid joined #git
19:27 Rodya_ joined #git
19:29 barteks2x joined #git
19:31 dling joined #git
19:32 Rodya_ joined #git
19:32 dan2k3k4 joined #git
19:34 showaz joined #git
19:34 phanimahesh joined #git
19:36 todd_dsm_ joined #git
19:36 k3rn31 joined #git
19:39 ronny hi im getting confused by git rebase again, i have a single commit on top of branch A, and want to rebase it onto Branch B - i tried git rebase --root A --onto B but that failed
19:40 tref joined #git
19:41 ronny i figured my misstake
19:41 ronny git rebase --onto B current A is the correct command
19:42 ronny uhm
19:42 ronny fml
19:42 ronny it wasnt
19:42 ronny how can i undo?
19:46 ronny hmm, ok, back to status quo
19:46 arooni joined #git
19:47 xorox90 joined #git
19:50 davisonio joined #git
19:53 jennings ronny: If it's one commit, it might be easier to use git cherry-pick
19:54 thiago_ joined #git
19:54 King_Hual joined #git
19:54 xorox90 joined #git
19:55 thiago__ joined #git
19:55 romerocesar joined #git
19:56 jennings ronny: but I think "git rebase --onto B A~1 A" will do what you want
19:56 jennings "Rebase everything from A's parent to A onto the branch B"
19:56 eijk joined #git
19:56 geoid joined #git
19:57 ekinmur joined #git
19:57 ronny jennings: i used git format_patch in the end
19:58 unbalancedparen joined #git
20:00 lvns joined #git
20:00 clemf joined #git
20:05 anbz joined #git
20:05 geoid joined #git
20:05 AlexRussia joined #git
20:06 jstimm joined #git
20:07 dan2k3k4 joined #git
20:07 zturner joined #git
20:07 Lynxium joined #git
20:09 Grea joined #git
20:19 yude joined #git
20:19 basiclaser joined #git
20:22 k3rn31 joined #git
20:23 ochorocho__1 joined #git
20:24 lvns joined #git
20:24 dan2k3k4 joined #git
20:25 gavin joined #git
20:26 Rodya_ joined #git
20:27 cdown_ joined #git
20:28 Epqg1 joined #git
20:29 d4rklit3 joined #git
20:30 fahadash joined #git
20:30 nidr0x joined #git
20:31 jaguarmagenta joined #git
20:35 mehola joined #git
20:36 Peuc joined #git
20:39 ojdo joined #git
20:41 sctskw joined #git
20:41 acetakwas joined #git
20:42 mehola joined #git
20:43 nidr0x joined #git
20:49 Scriptonaut joined #git
20:50 Scriptonaut hey guys. I have a git repo for my dotfiles. I added a couple files, and now when I do "git status", it tells me: "fatal: Not a git repository: prezto/modules/history-substring-searc​h/external/../../../.git/modules/modul​es/history-substring-search/external"
20:50 Scriptonaut there are other git repos inside the git repo, that creates a very confusing situation with submodules (something I don't understand)
20:50 Scriptonaut I'm not sure what I did to break it, but I was always able to do git status in my dotfiles directory with no issue
20:51 Scriptonaut here is the repo on github (before the changes I made today): https://github.com/robins35/dotfiles
20:51 Scriptonaut Could someone help me resolve the issue here? I want to commit my changes
20:52 lf622662 joined #git
20:53 khmarbaise_ joined #git
20:53 khmarbaise_ joined #git
20:56 nidr0x joined #git
20:56 ahmedelgabri joined #git
20:58 emx joined #git
20:58 benwbooth joined #git
20:59 ediz_ joined #git
21:01 lf622662 joined #git
21:01 fscala joined #git
21:02 AlexRussia joined #git
21:03 olertu joined #git
21:04 Jellyg00se joined #git
21:06 kadoban joined #git
21:08 nidr0x joined #git
21:10 interne7y joined #git
21:10 Scriptonaut anyhelp on these submodules?
21:11 SimonNa joined #git
21:14 reim joined #git
21:16 rom1504 are them submodules ?
21:17 rom1504 (did you git submodule add them ?)
21:17 davisonio joined #git
21:17 GavinMagnus joined #git
21:18 Scriptonaut rom1504: no
21:19 Scriptonaut I was able to fix it by manually copying the .git directory from another machine that the repo was working in
21:19 acetakwas joined #git
21:19 Scriptonaut then I did a git add and commit
21:20 nidr0x joined #git
21:22 JokerDoomWork joined #git
21:22 cdown_ joined #git
21:24 jaguarmagenta joined #git
21:26 boombatower joined #git
21:27 rom1504 if you have .git dirs in your repo, you should add them as submodules
21:27 rom1504 or weird things will happen
21:28 reim joined #git
21:31 d0nn1e joined #git
21:31 bx2 joined #git
21:32 nidr0x joined #git
21:34 reim joined #git
21:34 petn-randall joined #git
21:38 Noldorin joined #git
21:41 MattMaker joined #git
21:42 petn-randall Hi, I've got a tag 'upstream/3.3' in the 'upstream' branch, and I'd like to pull up until that commit into my master branch. How would the correct refspec for that look like? I tried 'git pull upstream/3.3' but that doesn't work as expected.
21:42 nidr0x joined #git
21:43 EduardoMartins joined #git
21:45 joki joined #git
21:45 Eugene petn-randall - !pull is not what you want; merge is
21:45 gitinfo petn-randall: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull:  http://longair.net/blog/2009​/04/16/git-fetch-and-merge/
21:46 Eugene Tags don't point to branches; they point (usually) to a commit.
21:47 Eugene I also suspect you have some naming collisions going on: If you have a tag literally named "upstream/3.3"  and a remote named "upstream", `git pull upstream/3.3` would look for a branch named 3.3 in the upstream remote. Probably not what you wanted
21:47 Scriptonaut left #git
21:48 mmlb joined #git
21:49 petn-randall Eugene: Indeed. 'git merge upstream/3.3' I think did what I want though, thanks.
21:50 Eugene !lol might help
21:50 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
21:52 Rhpza joined #git
21:53 petn-randall Ah nice, I've been using gitk for this until now, didn't know about that oneliner.
21:54 olertu left #git
21:55 nidr0x joined #git
21:56 Guest84560 joined #git
21:57 rgrinberg joined #git
21:59 ecksit joined #git
22:00 yude joined #git
22:00 yude joined #git
22:01 Guest84560 joined #git
22:01 shgysk8zer0 joined #git
22:01 LeBlaaanc joined #git
22:02 khmarbaise joined #git
22:03 linuxmint joined #git
22:07 Juri_Agarin joined #git
22:07 nidr0x joined #git
22:08 dreiss joined #git
22:09 boudicca joined #git
22:09 ceaucari joined #git
22:11 inflames joined #git
22:12 f3r70rr35f joined #git
22:16 nwkj86 joined #git
22:19 nidr0x joined #git
22:21 barteks2x joined #git
22:22 nettoweb joined #git
22:25 WaReZ joined #git
22:26 cdown joined #git
22:26 lfmobile joined #git
22:27 Rodya_ joined #git
22:28 lfmobile_ joined #git
22:28 morenoh149 joined #git
22:30 lfmobile__ joined #git
22:31 nidr0x joined #git
22:31 boudiccas joined #git
22:34 cdown joined #git
22:34 thiago__ left #git
22:34 thiago joined #git
22:36 DistantStar joined #git
22:39 ahmedelgabri joined #git
22:40 cdown_ joined #git
22:42 nidr0x joined #git
22:47 GavinMagnus left #git
22:49 xorox90 joined #git
22:51 ahr3n joined #git
22:58 cdown joined #git
22:59 AfroThundr joined #git
23:00 AfroThundr joined #git
23:04 dsantiag_ joined #git
23:05 nitin joined #git
23:05 eletuchy joined #git
23:07 nwkj86 joined #git
23:10 interne7y joined #git
23:11 nwkj86 joined #git
23:13 TheMontyChrist joined #git
23:15 jstimm joined #git
23:16 SwiftMatt joined #git
23:20 khmarbaise joined #git
23:21 LeBlaaanc joined #git
23:21 ffabi joined #git
23:23 mmlb joined #git
23:28 efdetonator joined #git
23:28 mischat joined #git
23:30 mattfoo joined #git
23:32 LeBlaaanc joined #git
23:32 jaguarmagenta joined #git
23:34 tristanp joined #git
23:36 unbalancedparen joined #git
23:41 chappy joined #git
23:41 fission6 joined #git
23:43 inflames joined #git
23:45 BSaboia joined #git
23:45 guardianJ joined #git
23:47 ciampix joined #git
23:48 mablae_ joined #git
23:56 unbalancedparen joined #git
23:59 mischat joined #git
23:59 chappy joined #git

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