Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-31

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

All times shown according to UTC.

Time Nick Message
00:12 JanC joined #git
00:13 tesuji_ joined #git
00:14 shaggycat_ joined #git
00:15 JanC joined #git
00:16 Synthead joined #git
00:16 ahrc333ff joined #git
00:16 danimal2 joined #git
00:21 zacts joined #git
00:23 jpX joined #git
00:24 rcf joined #git
00:24 rubie joined #git
00:27 adino joined #git
00:30 grill joined #git
00:34 Codfection joined #git
00:34 Mannn joined #git
00:35 RickyB98 joined #git
00:35 RickyB98 joined #git
00:38 citizen-stig joined #git
00:38 sandroqz joined #git
00:38 maarhart joined #git
00:39 maarhart How can I get stats on all my git activities?
00:39 maarhart Preferably on any project
00:40 osse maarhart: what kind of stats?
00:40 maarhart I don't know... Commits etc
00:41 osse git log ... | calculatestuff
00:41 daynaskully joined #git
00:41 lucasem joined #git
00:42 Synthead joined #git
00:43 maarhart Calculatestuff? What is that
00:43 osse something you have to write yourself
00:44 osse counting the number of commits you've made is easy. anything else you have to parse by hand from git log or git rev-list etc.
00:44 osse git rev-list --all --count --author=maarhart
00:44 spudowiar joined #git
00:45 maarhart Ok thanks
00:46 israelzuniga joined #git
00:47 osse maarhart: here's something I wrote that shows the average "size" of commits: http://sprunge.us/GdSS
00:47 osse you can do ./script.sh maarhart
00:49 mingrammer joined #git
00:50 ahmedelgabri joined #git
00:51 maarhart Thanks
00:52 catag87 joined #git
00:52 osse hmm, i might be able to do that directly with git log --patch instead of that xargs mess
00:53 osse I have some other stuff lying around to but I've forgotten where ;_;
00:56 osse here's one that alculates average message size: http://sprunge.us/ReOH
00:56 spudowiar joined #git
00:59 shgysk8zer0 joined #git
01:00 Synthead joined #git
01:02 RedneckDonut joined #git
01:04 crayon joined #git
01:05 arescorpio joined #git
01:05 jimi_ joined #git
01:09 Shadow-Z joined #git
01:09 ljc joined #git
01:10 polyzen do any of you have an opinion (or further reading) on whether (large) projects should include their docs alongside the source or in a separate repo
01:10 polyzen repo/wiki
01:11 Shadow-Z left #git
01:11 polyzen not my issue, but related https://github.com/certtools/intelmq/issues/511
01:11 polyzen Documentation in docs/ vs. Wiki
01:13 cdg joined #git
01:15 bibble polyzen: even a docs branch is an option too I guess.
01:16 polyzen http://i.imgur.com/rfFWukr.gif
01:16 str joined #git
01:17 polyzen I always thought orphan branches were supposed to be demon spawn
01:18 rubie joined #git
01:19 Synthead joined #git
01:23 polyzen oh right they're fairly common
01:24 osse polyzen: what kind of docs are we talking about? and what format?
01:26 polyzen it's a hypothetical. I was thinking user/dev docs in a markup
01:27 polyzen haven't thought about API docs for a library
01:27 spudowiar joined #git
01:27 polyzen osse ^
01:28 polyzen reading on how RTD works
01:29 nettoweb joined #git
01:30 bibble polyzen: :)
01:35 sdaugherty Maybe in a seperate docs repo
01:35 sdaugherty that way it can be standalone as well as included as a submodule
01:36 jost_ joined #git
01:36 sdaugherty unless your docs are very rigidly coupled with your development
01:38 rgrinberg joined #git
01:38 zumba_ad_ joined #git
01:40 rewt joined #git
01:42 Sazhen86 joined #git
01:46 nettoweb joined #git
01:46 mingrammer joined #git
01:46 netj joined #git
01:46 danslo_ joined #git
01:46 pks joined #git
01:46 fuchstronaut joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and nursery rhymes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Ring around the repo, pockets full of plumbing, objects, objects, we all commit.
01:49 osse polyzen: i'd stuff em in the same repo until i had a good reason not to
01:50 fahadash joined #git
01:50 osse dev docs definitely
01:51 ahmedelgabri joined #git
01:51 Dougie187 joined #git
01:53 catag87 joined #git
01:53 NeXTSUN joined #git
01:56 m0j0 joined #git
01:57 polyzen osse, sdaugherty, bibble, thank you :)
01:59 texinwien_ joined #git
01:59 d^sh joined #git
02:00 RedneckDonut joined #git
02:09 cdg joined #git
02:16 l4v2 joined #git
02:17 snowkidind joined #git
02:18 lindenle joined #git
02:25 Err404NF joined #git
02:26 jetpack_joe joined #git
02:28 ajf- joined #git
02:28 zivester joined #git
02:32 staafl joined #git
02:35 Gsham joined #git
02:38 mingrammer joined #git
02:39 realz joined #git
02:39 citizen-stig joined #git
02:45 fuchstronaut joined #git
02:53 watabou joined #git
02:55 hexagoxel joined #git
02:56 lagothri1 joined #git
02:57 chachasmooth joined #git
02:59 ahrc333ff joined #git
03:01 Finnoloid joined #git
03:03 nettoweb joined #git
03:04 Dougie187 left #git
03:05 BenderRodriguez joined #git
03:05 `opsBP joined #git
03:14 Gsham joined #git
03:20 k3rn31 joined #git
03:20 inflames joined #git
03:26 ajf- joined #git
03:32 zumba_ad_ joined #git
03:32 daynaskully joined #git
03:33 CheckDavid joined #git
03:35 Gsham joined #git
03:38 fstd joined #git
03:38 fstd joined #git
03:40 ajf- joined #git
03:41 daishan joined #git
03:41 dreiss joined #git
03:43 israelzuniga joined #git
03:44 zacts joined #git
03:45 ShekharReddy joined #git
03:45 danslo_ joined #git
03:48 ajf- joined #git
03:52 Sazhen86 joined #git
03:53 ahmedelgabri joined #git
03:54 Lunatrius` joined #git
03:55 jumpman joined #git
03:55 ljc joined #git
03:58 orbitphreak joined #git
03:58 jumpman joined #git
04:00 mingrammer joined #git
04:04 staafl joined #git
04:04 jumpman joined #git
04:07 Shentino joined #git
04:08 quantomworks joined #git
04:08 drbean_ joined #git
04:14 ahmedelgabri joined #git
04:15 rgrinberg joined #git
04:17 lindenle joined #git
04:17 orbitphreak joined #git
04:18 rubie joined #git
04:20 mingrammer joined #git
04:31 cyan__ joined #git
04:34 SwiftMatt joined #git
04:38 RustyShackleford joined #git
04:40 anu1 joined #git
04:40 citizen-stig joined #git
04:41 Electrometro joined #git
04:43 Cabanoss- joined #git
04:46 fuchstronaut joined #git
04:47 languitar joined #git
04:48 SwiftMatt joined #git
04:49 Derperperd joined #git
04:50 zacts joined #git
04:52 dreiss joined #git
04:53 byteflame joined #git
04:54 Corosauce joined #git
05:04 dsantiago joined #git
05:05 cdg joined #git
05:08 netj joined #git
05:11 Isla_de_Muerte joined #git
05:11 d4rklit3 joined #git
05:17 sagerdearia joined #git
05:17 nilg joined #git
05:25 phaleth joined #git
05:26 mingrammer joined #git
05:26 Douhan joined #git
05:33 Literphor joined #git
05:41 narendraj9 joined #git
05:41 tax joined #git
05:45 emPi joined #git
05:46 danslo_ joined #git
05:56 b_rare joined #git
06:00 ytl joined #git
06:01 hahuang61 joined #git
06:14 red_ joined #git
06:14 kisonecat joined #git
06:18 zincrokx joined #git
06:18 MZAWeb joined #git
06:19 zincrokx joined #git
06:19 lindenle joined #git
06:20 zincrokx joined #git
06:21 zincrokx joined #git
06:22 zincrokx joined #git
06:22 zincrokx joined #git
06:23 zincrokx joined #git
06:24 nnyk joined #git
06:24 ramsub07 joined #git
06:27 ahmedelgabri joined #git
06:32 anu1_ joined #git
06:32 anu1__ joined #git
06:35 freimatz joined #git
06:36 jaguarmagenta joined #git
06:36 SteffanW joined #git
06:38 dhollinger joined #git
06:39 jaguarma_ joined #git
06:42 citizen-stig joined #git
06:45 daynaskully joined #git
06:46 fuchstronaut joined #git
06:48 ahmedelgabri joined #git
06:49 khmarbaise joined #git
06:49 _sjs joined #git
06:53 citizen-stig joined #git
07:00 madprocess joined #git
07:02 Literphor joined #git
07:04 nnyk joined #git
07:04 ahmedelgabri joined #git
07:05 jaguarmagenta joined #git
07:05 nnyk joined #git
07:06 Sasazuka__ joined #git
07:09 paranoidabhi joined #git
07:10 paranoidabhi hi guys!
07:10 gitinfo paranoidabhi: 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.
07:10 ImJune joined #git
07:11 paranoidabhi Question: I moved back one commit by git checkout and then in the same branch made another commit and pushed to the remote. This is what I got:
07:11 paranoidabhi abhishek ((c9a2d5c...)) django-resumator $ git status  HEAD detached from 6d7f72e nothing to commit, working directory clean
07:12 paranoidabhi The remote also didn't get updated.
07:13 paranoidabhi any ideas?
07:14 lert joined #git
07:14 bremner paranoidabhi: do you understand !detached?
07:14 gitinfo paranoidabhi: 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
07:16 ljc joined #git
07:16 paranoidabhi bremner, when I moved back one commit, didn't the head get updated to point at that?
07:17 bremner no
07:17 bremner if you want to do that, then you want git-reset
07:18 HeWhois joined #git
07:19 phanimahesh joined #git
07:20 subhojit777 joined #git
07:21 paranoidabhi bremner, here's what I did https://bpaste.net/show/fe5a9e21a4ce
07:22 paranoidabhi bremner, I read detached but didn't understand why it occured in this case and how to resolve it.
07:23 bremner you checked out something that is not a branch
07:25 paranoidabhi bremner, 1. what's a better way to this then, create a new branch, make it changes in it and merge? 2. how can I fix the situation I am in right now?
07:25 thiago paranoidabhi: you want to first go back to the branch you were at before (git checkout -), then reset to the commit you're on right now (git reset -- hard 6d7f72e). CHeck the commit.
07:25 grift joined #git
07:26 paranoidabhi thiago, I was always in the master branch.
07:26 rzeka joined #git
07:26 rzeka joined #git
07:26 thiago paranoidabhi: but you're not anymore
07:26 thiago paranoidabhi: so you need to go back to master
07:26 marlinc joined #git
07:27 paranoidabhi Sry I am a bit confused. Can you explain more, I don't want to lose the recent commit.
07:28 thiago you're not in master
07:28 thiago git status told you: HEAD detached at 6d7f72e
07:28 thiago you ceased to be in master when you ran that git checkout command
07:28 paranoidabhi thiago, git checkout master; git reset --hard 6d7f72e?
07:29 thiago yes
07:29 paranoidabhi why the hard in reset?
07:29 thiago make sure that 6d7f72e is the current commit. Check with git log.
07:29 thiago because you want to check out the contents of that commit.
07:32 paranoidabhi thiago, I am getting this https://bpaste.net/show/71b8fd7a6053
07:32 thiago ok
07:32 thiago paranoidabhi: you're about to !rewrite history. Are you sure you want to do it?
07:32 gitinfo paranoidabhi: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
07:34 ExeciN joined #git
07:34 paranoidabhi thiago, sry I don't understand what does rewriting history mean?
07:35 thiago paranoidabhi: it means you've removed a commit from history
07:36 thiago paranoidabhi: it doesn't get deleted in other repositories by other people unless you tell them to do something.
07:36 thiago paranoidabhi: are you sure you wanted to remove that commit?
07:36 paranoidabhi thiago, yes
07:37 paranoidabhi thiago, 1->2. 1->3... 2 is lost?
07:37 thiago paranoidabhi: has anyone cloned your remote repository?
07:37 thiago yes
07:38 paranoidabhi thiago, I cloned it from someone. Created a pull request. The guy with the original repo. told to do it some other way. I moved back one commit and did it that way.
07:38 thiago ah, ok
07:38 thiago makes sense
07:38 thiago just do your push --force now
07:40 paranoidabhi thiago, should I ignore the status "Your branch and 'origin/master' have diverged"?
07:40 thiago that's what the push --force will change
07:40 Jackneill_ joined #git
07:43 harish_ joined #git
07:43 paranoidabhi thiago, thanks this works! Can you please if I am in situation like this again, what should I do?
07:43 thiago paranoidabhi: read the output of git status
07:44 nnyk joined #git
07:44 paranoidabhi Your branch is up-to-date with 'origin/master'.
07:44 paranoidabhi thiago, as in when I have to move back one commit.
07:44 thiago use reset if you want to move the branch
07:45 thiago but if you just want to modify something in the commit, git commit --amend
07:45 thiago gotta go. Good night.
07:46 paranoidabhi thiago, thanks. is only reset required, not checkout right?
07:46 paranoidabhi not-no
07:46 danslo_ joined #git
07:47 Mixologic_ joined #git
07:51 _ikke_ paranoidabhi: correct
07:51 despoil joined #git
07:51 _ikke_ git reset --keep HEAD~1 moves back one commit
07:53 paranoidabhi _ikke_, thanks
07:53 cdg joined #git
07:56 qqz joined #git
07:57 qqz how to display all files which differ between git-tag 4.6 and 4.6-rc7 and which are under the drivers/drm directory?
07:58 _ikke_ qqz: git diff --name-only 4.6 4.6-rc7 -- drivers/drm
07:58 robotroll joined #git
07:59 qqz thx.
08:01 ShekharReddy joined #git
08:02 ahmedelgabri joined #git
08:02 Darcidride joined #git
08:11 t0by joined #git
08:11 Darcidride joined #git
08:13 tomog999_ joined #git
08:13 Darcidride joined #git
08:16 xall joined #git
08:18 dsdeiz joined #git
08:32 satifant joined #git
08:34 ytl_ joined #git
08:37 fuchstronaut joined #git
08:40 ytl joined #git
08:42 citizen-stig joined #git
08:42 GavinMagnus joined #git
08:43 Limes_ joined #git
08:46 texinwien_ joined #git
08:50 nitin_ joined #git
08:50 rolha joined #git
09:00 eivarv joined #git
09:01 lert joined #git
09:02 a_thakur joined #git
09:08 GenZai joined #git
09:14 darkbit joined #git
09:14 ljc joined #git
09:16 mariuscc joined #git
09:17 catsup joined #git
09:21 GavinMagnus left #git
09:30 timblechmann joined #git
09:37 __xor joined #git
09:38 fuchstronaut joined #git
09:38 __xor joined #git
09:44 m0viefreak joined #git
09:47 Mixologi- joined #git
09:48 _sjs joined #git
09:49 danslo_ joined #git
09:52 grayjoc joined #git
09:53 ahmedelgabri joined #git
09:54 dopesong joined #git
09:59 catag87 joined #git
10:01 EduardoMartins joined #git
10:01 ambro718 joined #git
10:02 ambro718 Hi, I'm on Linux addign some files and git wants to convert CRLF to LF (it says "CRLF will be replaced by LF"). How to turn that off (check in as-is)? I tried setting core.autocrlf to false, it did not help.
10:03 _ikke_ ambro718: is there a .gitattributes file?
10:03 daynaskully joined #git
10:03 zeroed joined #git
10:04 ambro718 ah you're right, that was the problem
10:05 cyan__ joined #git
10:06 _ikke_ yw
10:11 phanimahesh joined #git
10:11 a_thakur joined #git
10:16 ramsub07 joined #git
10:17 eivarv joined #git
10:24 catsup joined #git
10:28 Lunatrius` joined #git
10:30 citizen-stig joined #git
10:32 rahtgaz joined #git
10:35 interne7y joined #git
10:37 spacelord joined #git
10:39 cbreak CRLF should die.
10:40 CIAguy joined #git
10:44 nikitasius joined #git
10:45 Dyonisos joined #git
10:49 slayerjain joined #git
10:51 ahmedelgabri joined #git
10:55 _ikke_ Send a memo to microsoft
11:00 Ineentho[m] joined #git
11:01 grawity uninvent typewriters
11:05 danslo_ joined #git
11:05 p4trix joined #git
11:06 rajdesai joined #git
11:08 p4trick joined #git
11:11 sdothum joined #git
11:11 piling_ joined #git
11:17 ojdo joined #git
11:18 mingrammer joined #git
11:22 xaa joined #git
11:24 leeN joined #git
11:25 neonKow joined #git
11:25 Balliad joined #git
11:27 YS joined #git
11:27 YS left #git
11:27 djb-irc joined #git
11:27 fractalized joined #git
11:30 rahtgaz well, if that is the case, you could also uninvent vt100
11:30 rahtgaz I think everyone is a sinner in the computing world :)
11:30 rahtgaz glass roofs
11:30 ome joined #git
11:36 interne7y joined #git
11:36 mycyber joined #git
11:37 GavinMagnus joined #git
11:38 fuchstronaut joined #git
11:38 fuchstronaut joined #git
11:39 affan joined #git
11:42 djb-irc joined #git
11:42 dopesong joined #git
11:47 Mixologic_ joined #git
11:53 mischat joined #git
11:55 eivarv joined #git
11:57 nitin_ joined #git
11:58 Error404NotFound joined #git
11:58 Error404NotFound joined #git
11:59 _sjs joined #git
12:02 harish_ joined #git
12:04 adrien_ joined #git
12:05 cyphase joined #git
12:07 mra90 joined #git
12:10 nitesh joined #git
12:21 m0viefreak joined #git
12:24 millerti joined #git
12:26 rgrinberg joined #git
12:29 Ragnor joined #git
12:33 sdothum joined #git
12:35 zeltak joined #git
12:36 zeltak hi all. simple (i hope) question. is there anyway to make force push the current local git folder to my repo (on gitlab)
12:36 zeltak i want to not deal with all confilct etc which i current have
12:37 zeltak and just want to have both local and repo be the same as currney local
12:37 zeltak *current
12:40 jhass zeltak: well you could just force push, but it'll cause headaches for anybody that cloned/pulled the old state and tries to pull
12:42 zeltak jhass: thx its just a repo between home and gitlab
12:42 zeltak for me
12:43 cdg joined #git
12:43 zeltak jhass: how do you suggest to procced?
12:44 mingrammer joined #git
12:44 jhass how did you end up with any conflicts then anyway?
12:44 jhass did you rebase or amend after pushing?
12:44 zeltak jhass: im a complete neewb. i think i forgot to pull before i commited and tried to push
12:44 zeltak let me paste what i did one minute
12:45 Dro joined #git
12:45 zeltak https://paste.xinu.at/mA21Z/
12:46 citizen-stig joined #git
12:46 jhass I mean if there's just this local clone and the gitlab repo, the only way for that to happen is that you rewrote history after pushing
12:47 Ragnor joined #git
12:47 zeltak jhass: to be honest i very new so anything is possible. how do you suggest to procceed. what i really want is to push my local copy which is the latest up to date to gitlab
12:48 jhass trying to understand why you're in the situation you are is quite crucial to the best way forward that won't cause you any immediate further trouble
12:49 ladderff joined #git
12:50 zeltak jhass: ok
12:50 texinwien_ joined #git
12:51 jhass so did you a) clone and push on another computer than the current one or another location than the current one b) ever call git commit --amend or b) ever call git rebase?
12:51 jhass or c) ever call git rebase of course
12:53 ladderff hi. suppose I want to interactive rebase everything from HEAD back to the common ancestor of HEAD and some other branch. Can I write that in one command?
12:53 zeltak jhass: i am 100% i did any of these :)
12:53 jhass zeltak: the important question is which
12:53 zeltak i mean didnt do any of the above :)
12:54 jhass maybe edited something with gitlabs UI? (idk if that's even possible)
12:54 jhass ladderff: should be just git rebase -i other_branch, no?
12:55 zeltak jhass: no never did that
12:56 nilg joined #git
12:56 ladderff jhass, I don't believe so. I'm trying to reorder commits made since I diverged from upstream; I *don't* want to transplant the branch I'm workng on
12:57 jhass zeltak: well, I'm out of ideas what else could have put you into this situation, you have to have done one of those
12:57 ladderff sorry i'm interrupting
12:57 zeltak jhass: thx so much appriciate your help
12:57 zeltak ill try to investigate furhter
12:58 Joseph_ joined #git
12:59 jhass zeltak: you can git push -f, note that in the case of a) it'll cause you trouble when pulling over there and in the case of d) (editing over gitlab) it might make you loose changes
12:59 jhass zeltak: start out with git merge --abort in any case
12:59 jhass that'll get you out of the conflict state
13:00 zeltak jhass: thx!
13:00 adrien_ joined #git
13:01 jhass ladderff: git rebase -i $(git merge-base HEAD other_branch) ?
13:01 ladderff lol right
13:01 ladderff so that's all, I'm not missing anything
13:01 catag87 joined #git
13:01 jhass idk, never noticed anything else either :)
13:02 ladderff at first I typed rebase -i upstream/master..HEAD
13:02 ladderff but it doesn't like that
13:02 MattMaker joined #git
13:02 Glooomy joined #git
13:02 ladderff log upstream/master..HEAD shows exactly the commits I want to reorder but rebase -i wants a single commit for an arg
13:03 Arguggi joined #git
13:03 ladderff ok so I'l use your exact one-liner next time
13:03 jhass there's git rebase --fork-point -i, not sure it does that but it seems so
13:03 meditans joined #git
13:03 ladderff never noticed that one ill check it out
13:06 danslo_ joined #git
13:06 ladderff that did exactly what I want, git rebase -i --fork-point upstream/master
13:06 ladderff thanks
13:06 ladderff nope, not exactly
13:06 ladderff because now those commits are descended from the tip of upstream/master
13:08 Joseph_ left #git
13:11 Joseph_ joined #git
13:13 mycyber joined #git
13:14 mycyber joined #git
13:14 `opsBP left #git
13:19 _ikke_ ladderff: I'm not sure, but "git rebase -i other_branch..." might work also
13:19 _ikke_ note the 3 dots
13:21 invex joined #git
13:21 MattMaker joined #git
13:23 ladderff fatal: needs a single revision
13:23 rahtgaz joined #git
13:24 shaggycat_ joined #git
13:26 _ikke_ Hmm, documentations says it should work
13:27 _ikke_ oh, perhaphs only with --onto
13:27 anuxivm joined #git
13:28 tango_ joined #git
13:30 ladderff ill play with it later, report back
13:31 AustinTheGrey joined #git
13:33 nikitasius joined #git
13:35 fahadash joined #git
13:37 drbean joined #git
13:39 rubie joined #git
13:39 fuchstronaut joined #git
13:45 MattMaker joined #git
13:45 Gsham joined #git
13:48 Mixologi- joined #git
13:48 affan left #git
13:52 Jon28_ joined #git
13:52 chid joined #git
13:52 chid_ joined #git
13:55 cyan__ joined #git
14:01 Discovery joined #git
14:02 catag87 joined #git
14:04 Shentino joined #git
14:04 IlNominePatre joined #git
14:05 MattMaker joined #git
14:05 spookyghost joined #git
14:06 dreiss joined #git
14:08 zumba_ad_ joined #git
14:09 cyphase joined #git
14:09 phanimahesh joined #git
14:11 _sjs joined #git
14:17 zacts joined #git
14:17 jimi_ joined #git
14:18 Gsham joined #git
14:19 mingrammer joined #git
14:19 MattMaker joined #git
14:24 MattMaker joined #git
14:26 eivarv joined #git
14:26 Mixologic_ joined #git
14:28 zumba_ad_ joined #git
14:29 WayToDoor joined #git
14:32 anu1 joined #git
14:32 anu1___ joined #git
14:33 zivester joined #git
14:35 millerti joined #git
14:37 ladderff so we have HEAD~n which is the nth parent of HEAD
14:37 ladderff is there a way to refer to the last parent of HEAD?
14:37 garethdaine joined #git
14:39 _ikke_ You mean the root commit?
14:39 dopesong joined #git
14:39 ladderff yeah
14:39 _ikke_ No, there is not shortcut for the root commit
14:40 osse ladderff: it's the nth ancestor btw. parent of parent of ...
14:40 osse the nth parent is HEAD^n
14:40 ladderff yes
14:40 ladderff that's what I meant sorry
14:40 _ikke_ osse: (Here is was trying not to be too pendantic :P)
14:40 osse :´(
14:40 ladderff yeah but insufficient pedantry in the git world could end up costing us :)
14:41 ladderff is there any not-totally-contrived case for a commit having more than two parents?
14:42 osse ladderff: ''git merge branch1 branch2''
14:42 ladderff sounds good
14:42 _ikke_ octopus merge
14:42 ladderff osse what other channels have I seen you in?
14:42 _ikke_ no clue why though
14:43 osse sometimes used when you want to merge several branches that are totally unrelated and you just wanna get it done
14:43 osse ladderff: #vim maybe
14:44 adrien_ joined #git
14:44 MattMaker joined #git
14:46 citizen-stig joined #git
14:49 treehug88 joined #git
14:51 Spec-Chum joined #git
14:52 baako joined #git
14:54 snowkidind joined #git
14:55 Jahhein0 joined #git
14:56 sangy joined #git
14:59 dreiss joined #git
15:00 spacelord joined #git
15:01 millerti joined #git
15:03 catag87 joined #git
15:05 wwwi joined #git
15:05 jaafar joined #git
15:06 Jackneill_ joined #git
15:07 wwwi hi
15:07 gitinfo wwwi: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
15:07 madewokherd joined #git
15:09 wwwi is it posible to have 1 app and two branches that each keeps a different php file?
15:09 dunpeal joined #git
15:09 wwwi so, in essence you have 2 web apps, but are really 1 web app and two branches with the different file?
15:09 dunpeal Hi. Is there a reliable way to count the number of commits between two refs?
15:10 dunpeal i.e. suppose that B is a descendent of A in a linear commit chain. Is there a reliable way to get the total number of commits between B and A?
15:13 MattMaker joined #git
15:14 osse wwwi: yes
15:14 osse dunpeal: rev-list --count A..B
15:16 gusnan joined #git
15:17 jstimm joined #git
15:18 Kuukunen joined #git
15:22 _ikke_ wwwi: You can, but you can not merge these branches together and keep the differences
15:23 Spec-Chum !backup
15:23 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
15:24 Kuukunen I'm trying to use Git for Windows with cygwin, so I understand if people would want to stay away from it
15:24 Kuukunen but almost everything is working, commits, merging, pushing, whatever
15:24 Kuukunen but pull --rebase gives me: fatal: Not a git repository: '/c/prog/smaa/.git'
15:24 Kuukunen and:  fatal: C:\Program Files\Git\mingw64/libexec/git-core\git-rebase cannot be used without a working tree.
15:24 Kuukunen which is infuriating since I'm sure everything was working before :<
15:25 wwwi ok, thanks
15:25 dopesong joined #git
15:25 Seveas Kuukunen: don't try git-for-windows in cygwin, it's not a cygwin app. When using cygwin, Uue the git that cygwin ships
15:25 Seveas s/Uue/use/
15:25 wwwi so, basically it's an app with different versions, but most of app is same and then a file is different in the two versions. so, this branches thing is possible?
15:26 Kuukunen Seveas: yea I would, the problem is that it's too slow to be useful in this one huge project I have
15:26 Kuukunen so I was kinda forced to hack around it :/
15:26 Seveas wwwi: sounds like an !xy problem to me.
15:26 gitinfo wwwi: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
15:27 Gsham joined #git
15:27 Kuukunen Seveas: yea, that's why I added a disclaimer in the start :P
15:27 MattMaker joined #git
15:28 Seveas Kuukunen: the problem is paths. The parts of git-for-windows that are shell scripts (such as git-rebase) don't understand the /c/... syntax
15:28 wwwi Seveas: well, and app has ten files, and a file need to be in two different flavors, their code, so overall you have 2 apps, but 9 out of 10 files are common in both. so, this branches thing I suggested is not ok?
15:28 Kuukunen Seveas: hm yea, but that also happens to be the exact same path syntax used by the Bash shell that comes with Git for Windows
15:29 Kuukunen so I'm wondering what it's doing differently
15:29 cagmz joined #git
15:29 Seveas wwwi: I'd avoid the need to have two different flavors of the same file. Either have 2 different files and let the code be configured to use one or the other, or merge the two files and do different things in the merged file based on which app it is
15:30 Seveas Kuukunen: that's not cygwin though. Cygwin is "special".
15:30 wwwi Seveas: ok
15:30 Seveas Kuukunen: disclaimer: I don't use windows. I just hear the git-for-windows maintainer rant on about path issues all the time on the git mailing list :)
15:31 wwwi Seveas: but is what I suggested possible?
15:31 Kuukunen well yea, the whole thing is pretty much a huge hack, but it happens to be the easiest way to get a usable command line and tools on windows :P
15:31 Seveas wwwi: possible: maybe. Sensible: hell no.
15:32 wwwi ok
15:32 goTAN joined #git
15:33 wwwi Seveas: what if that file is simply a configuration file?
15:34 wwwi some XML file, not code, couldn't I store it in two branches?
15:37 interne7y joined #git
15:39 flaguy48 left #git
15:39 Lomex joined #git
15:40 fuchstronaut joined #git
15:41 vuoto joined #git
15:42 Kuukunen hm, but also git-stash is a shell script and it seems to work fine
15:42 zumba_addict joined #git
15:42 MattMaker joined #git
15:45 PCatinean joined #git
15:47 f3r70rr35f joined #git
15:50 flaguy48 joined #git
15:51 m0viefreak joined #git
15:52 MattMaker joined #git
15:55 daivyk joined #git
15:55 nnyk joined #git
15:56 arand_ joined #git
15:57 Gsham joined #git
15:59 zacts joined #git
16:00 phanimahesh joined #git
16:02 thiago joined #git
16:03 catag87 joined #git
16:06 MattMaker joined #git
16:09 Zamerick joined #git
16:09 Rodya_ joined #git
16:11 netcarver joined #git
16:11 anuxivm joined #git
16:13 anuxivm joined #git
16:16 millerti joined #git
16:18 sdothum joined #git
16:18 anuxivm joined #git
16:20 anuxivm joined #git
16:21 anuxivm joined #git
16:21 GavinMagnus joined #git
16:22 sobersabre_ joined #git
16:23 _sjs joined #git
16:25 FuzzySockets joined #git
16:28 nitin_ joined #git
16:29 MattMaker joined #git
16:29 Rodya_ joined #git
16:29 Derperperd joined #git
16:30 Chunk2 joined #git
16:31 dunpeal osse: perfect, thanks.
16:33 davisonio joined #git
16:33 Rodya_ joined #git
16:35 davisonio joined #git
16:36 adrien_ joined #git
16:36 InfoTest joined #git
16:37 Darren_ joined #git
16:38 Seveas wwwi: (sorry, was having dinner) config doesn't go int he same repo as the code. Config goes in the repo for your config management system.
16:40 shauna So I'm working with someone else's undocumented setup on a server.  They have 4 git repositories with as far as I can tell the exact same content.  When I pull from github to one, it seems to update all of them.  Is anyone familiar with this kind of setup?
16:41 MattMaker joined #git
16:41 shauna I see there's a --mirror option for setting up git repos.
16:41 Kuukunen some sort of custom hacky hook?
16:41 shauna Any idea where I would look for that?
16:41 shauna The configs all look normal.
16:41 Kuukunen shauna: .git/hooks
16:41 jason237 joined #git
16:41 shauna thanks!
16:42 wwwi Seveas: hope you had a good dinner. so, maybe, I could make 2 dirs, one for each version of the app, have a main repo for main app, two repos for each config file, and then have a different composer file in each dir, which tell the project to install main repo and which config file I want?
16:43 Kuukunen Seveas: btw, I got it working by adding "unset GIT_DIR" to git_dir_init () in git-sh-setup
16:44 irco joined #git
16:45 knod joined #git
16:46 knod I think I really tied my repo into a weird pretzel type thing and I'm not sure how to get out of it
16:46 knod I'm scrolling to where it started
16:47 eivarv joined #git
16:47 knod I was trying to revert and looked up how to do that
16:48 knod Then I checked out the old commit that I wanted to revert to
16:48 knod Then I was in a headless state, or whatever that's called when you're not attached to a branch
16:48 _ikke_ yeah
16:48 _ikke_ detached HEAD
16:48 knod Yeah
16:49 knod I didn't want to make new branch and wasn't sure what was going on because the instructions didn't describe that
16:49 GavinMagnus left #git
16:49 knod So I did git checkout head
16:50 danimal2 joined #git
16:50 knod So that didn't do anything
16:50 knod I think
16:50 djb-irc joined #git
16:50 knod But I wasn't sure, so I checked out the commit again
16:50 Tachyon_ joined #git
16:50 millerti joined #git
16:50 knod by that point I'd made changes because I didn't realize weird stuff was happening
16:51 knod So finally I added a branch anyway
16:51 knod And commited that
16:51 Seveas wwwi: that sounds saner than the multiple branches plan
16:51 knod And it said there was nothing to commit
16:51 wwwi Seveas: ok, thanks
16:51 inflames joined #git
16:51 Seveas knod: 'git checkout head' indeed does nothing. How did you add the branch?
16:52 knod So then I tried to check out the old commit that I wanted to revert to again with new instructions
16:52 Seveas Because 'committing that' in the context of adding a branch makes no sense to me :)
16:52 knod Seveas: to make the branch I did `git checkout -b branch-name`
16:52 knod I wasn't sure what was going on at that point :/
16:52 knod So anyway, I was back in a detached head state
16:52 Seveas knod: ok, that sounds good. It'll have made a branch at the point where your head was detached
16:53 Seveas 'git checkout' does *not* do any reverting, so your whole start is wrong :)
16:53 knod (back at the old commit I want to revert to)
16:53 Codfection joined #git
16:53 Kuukunen knod: what do you mean by "reverting" in this case anyway?
16:53 knod At the detached head state, I tried to commit
16:53 Seveas knod: do you want git to forget everything newer than that commit, or to undo anything newer than that commit?
16:53 ShekharReddy joined #git
16:53 knod Kuukunen: by 'reverting' I mean I want to go backwards in history to not use the changes I made after that point
16:54 Kuukunen knod: were those changes commited?
16:54 knod Yes
16:54 Kuukunen so... you want to remove commits?
16:54 Seveas knod: ok, git reset is your friend. git reset --hard commit-sha1
16:54 knod Let me just finish the explanation so that you know where I'm at now
16:54 knod Hang on, let me explain
16:54 knod It gets more convoluted
16:54 Seveas heh
16:54 RustyShackleford joined #git
16:54 Kuukunen knod: altho be careful with git reset --hard, because it can actually make you lose work
16:55 sLite joined #git
16:55 knod So I couldn't commit the detached head, so I checked out a new branch yet again and commited again (which we have established does nothing)
16:55 MattMaker joined #git
16:55 knod So then I checked out my gh-pages branch and tried to merge the new branch into it
16:55 knod but it said "Already up-to-date."
16:56 knod Which confused me more
16:56 Seveas that actually all sounds pretty normal. You can't commit if you don't make changes (creating a branch is not a change), and you can't merge a commit that's alredy in your history
16:56 knod I wanted to see what it looked like at that point, and I couldn't remember how to do that in the console so I did git push, which I now realize I really shouldn't have
16:56 dunpeal left #git
16:56 Kuukunen knod: did you git add the changes?
16:57 knod Kuukunen: way back there? Yes, I added those changes.
16:57 knod So then I looked up yet other instructions and did `git revert commitid#`
16:57 Kuukunen you probably don't want to do git revert
16:58 knod But it said that it was reverting to the one _before_ the one that I had identified
16:58 Seveas knod: stop right here. Just give us the url to the repo and we can actually tell you what to do to untangle this
16:58 knod Well, it's too late now :P
16:58 knod Seveas: I haven't pushed that part yet
16:58 Seveas because this is only going to get messier :)
16:58 romerocesar joined #git
16:58 knod I figured I better come on here before I do much else
16:58 Seveas knod: with what you pushed so far we should be able to help
16:58 knod Ok
16:58 knod https://github.com/knod/codeboard/commits/gh-pages
16:58 Codfection joined #git
16:59 knod So then I tried to do `git checkout id#ofcommitIwant`
16:59 Seveas that doesn't look too messy. No extra branches (so those didn't get pushed)
16:59 Seveas what is the sha1 you want?
16:59 knod "Fixes #18"
17:00 Seveas git checkout gh-pages
17:00 Seveas git reset --hard 4a3b655
17:00 Seveas git push -f origin gh-pages
17:00 Seveas done.
17:00 Seveas don't ever do 'git checkout commit-sha1' again, until you know what it does :)
17:00 knod I thought I knew, so I don't know how to judge that anymore
17:01 knod So if I do those commands where will I be at?
17:01 knod And doesn't that destroy history?
17:01 Kuukunen yea, it will destroy history
17:01 knod Dang
17:01 Seveas then gh-pages will point to #18 and history newer than that commit will be gone, as you said you wanted
17:01 Kuukunen and you should only do that if you're sure other people haven't checked out commits after that 4a3b655
17:01 knod I don't need the history to be gone
17:01 knod lol, no one's working on my stuff other than me
17:02 Seveas though the history will still be in the anim-debug branch
17:02 knod I'd rather keep the history if I can
17:02 Seveas so it won't be gone completely, just from the gh-pages branch
17:02 rubie joined #git
17:02 knod Hmmm
17:02 knod Ok, I think
17:03 knod How about the newest branch I created?
17:03 knod Will that exist?
17:03 Seveas yes.
17:03 knod Well, the two new branches I guess
17:03 Seveas they will both exist until you delete them
17:03 Seveas but I can't see where they're at as you didn't push them
17:03 knod I guess it's three by now
17:04 jstimm joined #git
17:04 knod Seveas: So the next time I push, they'll be there?
17:04 catag87 joined #git
17:05 Seveas when you push the branch yes (by default git only pushes the branch you're on, so you'll need to be explicit in the push)
17:05 jstimm joined #git
17:06 eijk joined #git
17:06 knod Ok, so when I fetch or pull from github other branches don't exist?
17:06 Seveas if you want to know more about undoing things in git, spend some time on https://git.seveas.net/undoing-all-kinds-of-mistakes.html#undoing-all-kinds-of-mistakes :)
17:06 knod That I will definitely do, thanks
17:06 Seveas knod: 'git ls-remote' will show you which branches exist on github
17:07 knod Seveas: I just want to know if my stuff gets destroyed if I pull in from github, where those branches don't exist
17:07 danslo joined #git
17:08 knod I wish there was a way I could do it with a visualization
17:08 eijk joined #git
17:09 cagmz joined #git
17:09 Seveas knod: ah, no, they won't get destroyed
17:09 knod Ok, good to know
17:10 MattMaker joined #git
17:10 knod It was weird because whatever I did, there were always no commits to do
17:10 zorro joined #git
17:10 sangy joined #git
17:11 goTAN joined #git
17:11 ytl joined #git
17:11 hoptux joined #git
17:11 knod Ok, that looks right on github
17:11 Seveas because you never made any changes
17:12 knod It seemed to me like I made changes, but I guess not
17:12 Seveas all you did was muck about with where branches did and dit not point
17:12 Seveas you changed no files
17:12 shaggycat_ joined #git
17:12 paul424 joined #git
17:12 knod Right, but shouldn't that have looked different on github?
17:13 jstimm joined #git
17:13 Seveas no, because you didn't actually change where the gh-pages branch pointed
17:13 knod le sigh
17:13 knod Not at you
17:13 knod Ok, well, hopefully fixed now
17:13 Seveas creating a branch, or detaching head, doesn't change the branch that you came from :)
17:14 SteffanW joined #git
17:14 jstimm joined #git
17:14 Seveas only making a commit (git commit, git merge, git revert) or moving backwards in time (git reset) change where a branch points to.
17:14 Guest40504 Hello everyone! I am setting up a git repo on my server which hosts a site. Currently there is code already present on the server and the site is up. I want to do the following : 1) Create a repository on the server outside public_html where all devs will push their codes. 2) I review/test the code and then push/deploy these to public_html. I have been reading about this since yesterday and it gets very confusing.
17:14 knod Guest40504: It tends to stay very confusing for a while
17:15 knod Always save backup folders :/
17:15 Seveas Guest40504: you already have one up on the people who want public_html to be the main repository, so good on you :)
17:15 Guest40504 @knoed Yes I am working on a backup folder.
17:15 Guest40504 @knod
17:16 jstimm joined #git
17:16 knod Eh, pay me no mind
17:16 knod Listen to the good folk here who seem to know what they're talking about
17:16 realz joined #git
17:17 knod Now I want to pull changes from upstream and merge with them :/
17:18 Seveas your repo is not a fork
17:19 Seveas is your upstream not on github?
17:19 knod Seveas: It's not a fork because my upstream is another repo of mine and I couldn't figure out how to fork it
17:19 knod Someone told me recently I should make it a node package instead
17:19 jstimm joined #git
17:20 knod That seemed like a solid plan, but I haven't done that before
17:20 sanketdg joined #git
17:20 fuchstronaut joined #git
17:21 zorro786 joined #git
17:21 mellernoia joined #git
17:21 blackwind_123 joined #git
17:21 zorro786 @knods Have you solved your issue?
17:22 knod zorro786: I think so
17:22 knod I never feel completely sure about stuff with git
17:23 zorro786 So you are trying to achieve something similar as I posted, right?
17:23 Limes_ joined #git
17:24 knod zorro786: I'm not sure. I don't think I saw what you wrote
17:25 knod I mean, with help I solved the reverting issue
17:25 knod Haven't yet pulled in from upstream
17:25 knod Looking that up now
17:25 knod Have had to look it up every time I do it :P
17:28 knod I _think_ I have just achieved that
17:28 knod Oh! New question!
17:28 knod My younger brother wants to create a repo, but some of his files have weird symbols in them
17:29 _ikke_ What kind of symbols
17:29 knod Hmm, I think one was like a bullet-point type symbol
17:29 knod @_ikke_
17:29 staafl joined #git
17:30 knod When we checked out what the file looked like after, it had weird non-symbol characters
17:30 MattMaker joined #git
17:30 knod We need to keep the symbols as they are
17:30 BryzNSTY joined #git
17:30 knod Any way to do that?
17:31 ResidentBiscuit joined #git
17:31 jstimm joined #git
17:31 _ikke_ Is there anything preventing you to do that?
17:31 _ikke_ iirc, git does not change them
17:32 cdg joined #git
17:32 knod _ikke_: As I said, it did change them
17:32 knod Or maybe github changed them? I'm not sure which.
17:32 knod We would need to be using github
17:33 jstimm joined #git
17:33 rubie joined #git
17:33 knod They came back as a capital letter A followed by some other, regular, symbols
17:33 _ikke_ github cannot change it, that would cause hashes to change
17:33 knod Somehow the file got changed. We didn't edit anything
17:33 _ikke_ It looks like more that the charset it gets interpreted at is different
17:33 _ikke_ Ie, how you see it
17:33 knod All we did was add, commit, push, and pull
17:34 cdg_ joined #git
17:34 knod _ikke_: I'm not sure what that means or how to fix that either
17:34 Error404NotFound joined #git
17:34 vuoto joined #git
17:34 sagerdearia joined #git
17:34 _ikke_ In your editor, change the charecter encoding
17:34 _ikke_ something like that
17:35 adrien_ joined #git
17:35 knod _ikke_: I'll look into that
17:36 RedneckDonut joined #git
17:37 acetakwas joined #git
17:37 Synthead joined #git
17:38 goTAN joined #git
17:38 rahtgaz joined #git
17:38 interne7y joined #git
17:39 acetakwas joined #git
17:42 stonerfish joined #git
17:43 fuchstronaut joined #git
17:43 sLite joined #git
17:44 MattMaker joined #git
17:44 Err404NF joined #git
17:45 mingrammer joined #git
17:46 millerti joined #git
17:50 Finnoloid joined #git
17:51 ec\ joined #git
17:52 millerti joined #git
17:52 yoan___ joined #git
17:53 goTAN joined #git
17:56 grill joined #git
17:56 Spec-Chum This is probably a really simple, and common concept, but I've Googled and just got confused. I want to fork a repo, create a custom one for myself (with like -march=native, for example) but also a separate repo I can do pull requests from, al while keep them up to date from upstream.  What's there best way for this?
17:56 _leb joined #git
17:59 titanium17 joined #git
18:00 dsdeiz joined #git
18:01 Shakeel_ joined #git
18:01 interne7y joined #git
18:03 jaguarmagenta joined #git
18:03 pasadinhas joined #git
18:04 millerti joined #git
18:06 adrien__ joined #git
18:07 jaguarma_ joined #git
18:09 Captain_Ramius joined #git
18:09 zacts joined #git
18:09 MattMaker joined #git
18:10 Heisenberg1276 joined #git
18:10 Mikaela joined #git
18:10 tazle_ joined #git
18:11 jaguarmagenta joined #git
18:11 phanimahesh create a custom one as in?
18:12 explodes joined #git
18:13 Gsham joined #git
18:14 Spec-Chum phanimahesh, as in I wouldn't really want to put -march=native until a PR, maybe more changes I'll make just for me
18:14 Spec-Chum *into not until
18:14 romerocesar joined #git
18:15 phanimahesh just create a fork and work on a branch. I'm sorry, I don't understand what's the issue here
18:15 Spec-Chum that's only an example though, there will be other changed specifically for me
18:15 Spec-Chum phanimahesh, it's OK, it's me, I'm not sure how to explain it
18:15 Spec-Chum I want 2 repos, one for the masses that I could request pull requests from and one just for me
18:16 phanimahesh okay. why two repos? you want to hide your changes?
18:16 phanimahesh if you just want to isolate them, same repo with different branches is fine
18:17 Spec-Chum not so much hide, but the original, and thus any PR's will need to run on my devices and OS's, I want to customise mine to run as fast as it can for windows whilst still being able to assist with issues and generating PR's
18:17 Spec-Chum s/my/many
18:17 Spec-Chum sorry, typing sucks today
18:18 Spec-Chum obviously I can't PR anything that is windows only
18:18 phanimahesh use separate branches in a single repo.
18:18 Err404NF joined #git
18:18 phanimahesh I still don't see any reason it can't be used
18:19 Repox joined #git
18:19 jaguarmagenta joined #git
18:19 Spec-Chum phanimahesh, it probably can, I'm a git n00b, I just wanted to know the best way
18:19 fuchstronaut joined #git
18:19 BOLChat52894 joined #git
18:19 Spec-Chum I figure it out :)
18:20 Spec-Chum thanks tho, your confirmation of what I suspected was useful
18:21 BOLChat52894 left #git
18:22 Spec-Chum One more question, is 'git pull upstream master' the correct way of getting my fork up to date with upstream?
18:22 Spec-Chum then I just git push?
18:22 MattMaker joined #git
18:22 jaguarma_ joined #git
18:22 thecomedian joined #git
18:23 d0nn1e joined #git
18:24 Goplat joined #git
18:25 Lunatrius` joined #git
18:25 Mikaela joined #git
18:26 phanimahesh yes, it is.
18:26 Spec-Chum sweet, you're a star, sorry for being a pain :p
18:26 phanimahesh I recommend git pull --rebase upstream master on your branch with local changes.
18:27 phanimahesh To understand why, read up on git branching and rebasing.
18:27 Spec-Chum whoa, hang on.  WHat's the difference?
18:27 Spec-Chum OK
18:27 phanimahesh The difference is in how the history will be after the pull.
18:28 EduardoMartins joined #git
18:28 knod I thought you had to git fetch upstream branch-name and then do git merge upstream/branch-name
18:28 jaguarmagenta joined #git
18:28 phanimahesh if you have a git repo handy, look at git log --oneline --graph constantly till you get an intuition of what git does with each command.
18:28 knod I heard rebase one place, then came on here one time when it got messed up and people said to merge instead of rebase
18:28 phanimahesh knod: pull is fetch + merge
18:29 Spec-Chum knod, oddly, that's what I read first, then I read about doing git pull upstream master
18:29 Spec-Chum , then I goto confused and asked here lol
18:29 phanimahesh rebase must be done right, it's easy to mess up.
18:29 knod Got it, phanimahesh, makes sense
18:29 Spec-Chum my god, I can't type today
18:29 skylite joined #git
18:30 knod I can't anything this afternoon
18:30 knod Well, every afternoon
18:30 phanimahesh usually to maintain just a few private changes on top of upstream, git pull --rebase is way nicer than standard merges.
18:30 tazle_ joined #git
18:30 davisonio joined #git
18:30 neonKow joined #git
18:31 Spec-Chum git pull --rebase upsteam master
18:31 Spec-Chum error: Cannot pull with rebase: You have unstaged changes.
18:31 Spec-Chum <-- interesting, wasn't expecting that
18:31 millerti joined #git
18:31 Spec-Chum I'll have a read, thanks again (wasn't a question lol)
18:31 rypervenche When doing an interactive rebase to edit a commit message, is it possible to edit the message there or do I have to go into a vim session for each commit and save each one?
18:31 phanimahesh you must commit or stash local changes before anykind of pull.
18:32 Spec-Chum git pull upstrem master worked tho?
18:32 phanimahesh rypervenche: interactive rebase puts you first in a todo mode where you tell git what to do. the only significant parts there are the commands (pick/edit/...) and commit ids.
18:32 d0nn1e joined #git
18:33 phanimahesh the messages are only for convenience.
18:33 phanimahesh to edit a message, use reword there, and edit the commit message when git prompts you to.
18:33 rypervenche phanimahesh: AHhh, so there is no way to conveniently do it all at once like that then?
18:34 osse rypervenche: you can cobble it together by adding a 'exec git commit --amend -m blablab' line
18:34 osse short version: no
18:34 rypervenche I can do it that way, as I don't have too many to do, but I'm just curious. Ok thanks.
18:34 phanimahesh Spec-Chum: Oh. I must remember it wrong, then.
18:35 _sjs joined #git
18:35 phanimahesh regardless, it's a good idea to always have a clean workdir before pulling. makes life easier.
18:35 israelzuniga joined #git
18:36 Spec-Chum I've only got one file that's changed so even if that was overwritten it wouldn't matter
18:40 mingrammer joined #git
18:42 MattMaker joined #git
18:42 syndikate joined #git
18:44 Mikaela joined #git
18:45 RustyShackleford joined #git
18:45 ambro718 joined #git
18:46 Darren_ joined #git
18:48 romerocesar joined #git
18:48 khmarbaise joined #git
18:49 Guest1100101 joined #git
18:52 MattMaker joined #git
18:53 duartepe- joined #git
18:53 SwiftMatt joined #git
18:54 Literphor joined #git
18:54 k3rn31 joined #git
18:55 davisonio joined #git
18:58 [exa] just 'git stash' I guess
18:58 [exa] ohm /me talking to myself.
19:00 darkbit joined #git
19:01 romerocesar joined #git
19:01 romerocesar joined #git
19:03 shgysk8zer0 joined #git
19:03 fuchstronaut joined #git
19:04 rubie joined #git
19:06 spacelord joined #git
19:07 MattMaker joined #git
19:08 danslo joined #git
19:08 shaggycat_ joined #git
19:12 tvw joined #git
19:15 cyan__ joined #git
19:18 Guest1100101 joined #git
19:20 Literphor joined #git
19:21 hahuang61 joined #git
19:22 BenderRodriguez joined #git
19:23 ahmedelgabri joined #git
19:24 ajf- joined #git
19:24 ResidentBiscuit joined #git
19:26 MattMaker joined #git
19:27 romerocesar joined #git
19:28 khmarbaise joined #git
19:29 johnmilton joined #git
19:29 xall joined #git
19:30 fractalized joined #git
19:32 boushi joined #git
19:32 Literphor joined #git
19:32 ormaaj joined #git
19:36 ahmedelgabri joined #git
19:36 MattMaker joined #git
19:36 ckubrak joined #git
19:40 ckubrak Hi guys, I have only a few files on my local that I sync. Because of that everytime I modify them I have to add them again. Is there anyway to avoid having to add them everytime?
19:41 _ikke_ You can use git commit -am to commit everything
19:41 _ikke_ git commit -a
19:41 phanimahesh ckubrak: no. It's to protect your repo, but if you want convenience there's git commit -a
19:42 _ikke_ But git is not the best tool for synchonizing files
19:42 _ikke_ there are better tools
19:42 Tachyon_ joined #git
19:42 armenzg joined #git
19:42 phanimahesh I would recommend against commit -a, but it's there if you want. And yep, use a sync tool instead of git for syncing
19:43 _ikke_ Me too
19:43 ytl_ joined #git
19:44 goTAN joined #git
19:44 ckubrak Ok, thanks!
19:45 spacelord joined #git
19:45 ytl_ joined #git
19:45 ahrc333ff joined #git
19:46 MattMaker joined #git
19:46 tcsc joined #git
19:46 Derperperd joined #git
19:48 cagmz joined #git
19:49 paul424 joined #git
19:49 davisonio joined #git
19:50 ahmedelgabri joined #git
19:53 davisonio joined #git
19:53 ResidentBiscuit joined #git
19:54 Cassiopaya joined #git
19:55 yqt joined #git
19:56 chuchunaku joined #git
19:56 ec\ joined #git
19:57 IlNominePatre joined #git
19:58 romerocesar joined #git
19:59 shaggycat_ joined #git
20:00 MattMaker joined #git
20:03 zeroed joined #git
20:03 jave joined #git
20:04 fuchstronaut joined #git
20:05 ytl joined #git
20:06 GavinMagnus joined #git
20:08 Mannn joined #git
20:10 MattMaker joined #git
20:11 diegoviola joined #git
20:14 Lunatrius joined #git
20:15 Macaveli joined #git
20:15 mingrammer joined #git
20:17 rubie joined #git
20:19 Lunatrius` joined #git
20:21 ckubrak joined #git
20:23 iDanoo joined #git
20:23 godulam joined #git
20:24 acetakwas joined #git
20:24 yqt joined #git
20:29 nettoweb joined #git
20:31 Darcidride joined #git
20:31 ahrc333ff joined #git
20:31 grayjoc joined #git
20:32 Rodya_ joined #git
20:36 paul424 joined #git
20:38 goTAN joined #git
20:38 davisonio joined #git
20:39 _sjs joined #git
20:39 zumba_ad_ joined #git
20:43 eijk joined #git
20:44 moneylotion joined #git
20:46 eijk joined #git
20:48 texinwien_ joined #git
20:49 djb-irc joined #git
20:51 Harwood joined #git
20:53 rahtgaz_1 joined #git
20:53 rahtgaz_1 joined #git
20:54 MattMaker joined #git
20:55 orbitphreak joined #git
20:57 ljc joined #git
20:57 millerti joined #git
20:59 MattMaker joined #git
20:59 rahtgaz joined #git
20:59 knod left #git
21:02 ahmedelgabri joined #git
21:02 GavinMagnus left #git
21:04 Guest1100101 joined #git
21:06 leb joined #git
21:09 mingrammer joined #git
21:10 danslo joined #git
21:12 titanium17 joined #git
21:13 JanC_ joined #git
21:17 jason237 joined #git
21:17 johnmilton joined #git
21:17 mehola joined #git
21:18 hoptux left #git
21:19 Darren_ joined #git
21:21 Pulp joined #git
21:24 Darren__ joined #git
21:25 plasticle joined #git
21:26 invex joined #git
21:27 NightMonkey joined #git
21:28 MattMaker joined #git
21:29 WaReZ joined #git
21:29 cagmz joined #git
21:30 z8z joined #git
21:30 Lunatrius joined #git
21:31 sn0w75 joined #git
21:31 rubie joined #git
21:31 jaguarmagenta joined #git
21:33 sn0w75 joined #git
21:34 MattMaker joined #git
21:36 invex joined #git
21:38 Literphor joined #git
21:41 diogenese joined #git
21:41 adante joined #git
21:41 ColdKeyboard joined #git
21:42 MattMaker joined #git
21:45 jstimm joined #git
21:46 hahuang61 joined #git
21:49 zumba_ad_ joined #git
21:49 moneylotion left #git
21:50 jaguarmagenta joined #git
21:50 RustyShackleford joined #git
21:52 t0by joined #git
21:52 cagmz_ joined #git
21:53 diogenese joined #git
21:53 plasticle joined #git
21:54 sn0w75 left #git
21:55 kriskropd joined #git
21:56 shaggycat_ joined #git
21:57 Darren_ joined #git
21:58 invex joined #git
22:01 MattMaker joined #git
22:02 aidalgol joined #git
22:05 fuchstronaut joined #git
22:06 cdg joined #git
22:11 bibble left #git
22:16 e89c8c95a050 joined #git
22:17 jason237 joined #git
22:18 zacts joined #git
22:18 Oebele joined #git
22:19 romerocesar joined #git
22:19 jaguarmagenta joined #git
22:20 jottr joined #git
22:22 jottr joined #git
22:23 CheckDavid joined #git
22:23 sleepee joined #git
22:24 snowkidind joined #git
22:25 cyphase joined #git
22:29 ckubrak joined #git
22:29 romerocesar joined #git
22:30 lb joined #git
22:30 cyan__ joined #git
22:31 Guest23219 joined #git
22:34 t0by joined #git
22:34 plasticle joined #git
22:36 MattMaker joined #git
22:36 cdg joined #git
22:40 red_ joined #git
22:41 jaguarma_ joined #git
22:42 MattMaker joined #git
22:44 sarbs joined #git
22:44 goTAN joined #git
22:45 anuxivm joined #git
22:47 z8z joined #git
22:47 hahuang61 joined #git
22:47 akkad joined #git
22:48 sarbs joined #git
22:52 Finnoloid joined #git
22:53 Manuel15 joined #git
22:53 Manuel15 joined #git
22:55 jaguarmagenta joined #git
22:57 mingrammer joined #git
22:57 feneco joined #git
22:58 feneco left #git
23:03 fahadash joined #git
23:05 ytl_ joined #git
23:09 catag87 joined #git
23:10 zacts joined #git
23:10 MattMaker joined #git
23:11 danslo joined #git
23:11 adrien_ joined #git
23:13 leb joined #git
23:15 ladderff joined #git
23:16 ladderff anyone hav ea good alias for git blame?
23:16 romerocesar joined #git
23:16 i7c How about g bl!
23:16 i7c I think it’s wonderful.
23:16 ladderff haha
23:16 a3Dman joined #git
23:16 i7c ;)
23:17 HedgeMage whodonit
23:17 HedgeMage :P
23:17 MZAWeb joined #git
23:18 pinewoman joined #git
23:19 mablae_ joined #git
23:19 pinewoman left #git
23:22 ahmedelgabri joined #git
23:22 qsx git praise
23:23 SwiftMatt joined #git
23:24 sleepee joined #git
23:25 jhave joined #git
23:25 jhave Hello :)
23:25 gitinfo jhave: 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.
23:27 ladderff is there a way to specify the revision where
23:27 ladderff branches diverge
23:27 spookyghost joined #git
23:28 sleepee joined #git
23:28 MattMaker joined #git
23:28 d0nn1e joined #git
23:29 ladderff in other words I want to do rebase -i on the commits branch..master
23:29 ladderff but rebase wants a single revision for its argument
23:30 ahrc333ff joined #git
23:31 ahrc333ff joined #git
23:31 jhave Sorry but I'm new to GIT but have a little question to know how to build it. I have a system which is being developed externally as I adapt and dishes in but I would like to have it so I can indleje my corrections in future versions as I receive. there is a smart way to handle it?
23:33 MattMake_ joined #git
23:34 cdown joined #git
23:37 GyrosGeier joined #git
23:38 MattMaker joined #git
23:39 texinwien_ joined #git
23:40 byteflame joined #git
23:42 ImJune joined #git
23:42 Spec-Chum Is github desktop help a no, no in here?
23:42 qsx Spec-Chum: it's !3rd (and if you ask me, utter crap)
23:42 gitinfo Spec-Chum: [!3rdparty] That tool is not part of git-core. I don’t know, but if you’re patient, someone else might answer your question.
23:43 Spec-Chum yeah, can't say I'm keen, hence why I appear to be confused haha
23:43 Spec-Chum Very quickly, if you know, great, if you don't, never mind
23:43 MattMake_ joined #git
23:43 Spec-Chum I've just installed github desktop and synced, but git status in bash is showing all the files changed as modifed, is that right?
23:43 Spec-Chum I had assumed it would just say everything is up to date
23:44 Spec-Chum s/changed/flagged
23:44 qsx kinda sounds like !crlf
23:44 gitinfo to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/
23:45 Spec-Chum ah, perfect :D
23:45 Spec-Chum thanks
23:46 Spec-Chum thought it was wierd
23:47 zumba_ad_ joined #git
23:48 MattMaker joined #git
23:49 sn131678 joined #git
23:50 afuentes joined #git
23:51 Spec-Chum qsx, I've deleted it already, took an instant dislike to it
23:52 mingrammer joined #git
23:54 gfixler2 joined #git
23:55 zumba_ad_ joined #git
23:56 Gitzilla joined #git
23:57 MattMaker joined #git
23:57 ToBeCloud joined #git
23:58 despoil joined #git

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