IRCloggy #git 2014-11-24

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2014-11-24

→ tanath__ joined00:00
→ maestrojed joined00:00
→ shawn joined00:00
→ DolpheenDream joined00:00
shawn → Guest7112600:01
← devoldmx3 left00:01
← eletuchy left00:02
→ eletuchy joined00:02
← tanath_ left00:02
→ luminous joined00:03
→ devoldmx joined00:04
→ amikiri joined00:05
← eletuchy left00:07
← Guest71126 left00:07
← msmith left00:08
→ jeffmjack joined00:09
← corni left00:11
→ tier joined00:12
← kpreid left00:14
→ lindenle joined00:16
← hexagoxel left00:16
→ gavit joined00:17
r0bby_ → robbyoconnor00:20
← lindenle left00:20
→ Sadi joined00:20
← csstylish left00:21
→ webguy joined00:23
← dregad left00:24
→ solker joined00:25
→ joedf_phone joined00:25
← russt left00:26
← jagob left00:28
← solker left00:29
→ whomp joined00:29
← blackmesa left00:30
← layke left00:30
← netcarver left00:31
← weevieL left00:32
← s8321414 left00:33
→ Lyqyd_ joined00:34
Consuela_ → Consuela00:35
← note left00:35
← endiruna left00:37
← Lyqyd left00:37
← LucasTT left00:38
→ Xiti` joined00:38
← Xiti` left00:38
→ Prawnzy joined00:39
→ nucatus joined00:40
→ Xiti` joined00:40
→ devoldmx3 joined00:40
← mtscout6 left00:41
← devoldmx left00:42
← Xiti left00:42
→ mtscout6 joined00:44
← dreiss left00:44
← nucatus left00:44
← madewokherd left00:46
→ ErKa joined00:47
← WaReZ left00:47
→ dreiss joined00:47
← SonikBoom left00:47
→ Goplat joined00:48
← Sadi left00:49
→ Sadi joined00:49
← harish left00:49
→ devoldmx joined00:50
← devoldmx left00:50
→ devoldmx joined00:50
→ Juzzika joined00:50
← devoldmx3 left00:54
→ mizu_no_oto joined00:54
→ EminenceHC joined00:54
← EminenceHC left00:59
← hebz0rl left00:59
← maestrojed left01:02
← Sadi left01:03
→ jb55_ joined01:04
← danemacmillan left01:07
← jb55 left01:07
← [R] left01:08
→ danemacm1 joined01:09
← Takle_ left01:10
← alanwill left01:13
→ weiyang joined01:16
→ fstd joined01:17
← StefanLehmann left01:18
→ phantombeta joined01:18
← danemacm1 left01:20
→ gfixler joined01:21
← robustus left01:21
→ danemacmillan joined01:21
← MattMaker left01:22
→ wrouesnel2 joined01:22
→ robustus|Off joined01:23
robustus|Off → robustus01:24
→ dsdeiz joined01:24
← dsdeiz left01:25
→ dsdeiz joined01:25
→ john_doe_jr joined01:25
john_doe_jr How do you git clone into an existing folder?01:25
→ solker joined01:25
← amikiri left01:30
← solker left01:30
mattcen john_doe_jr: if it's an empty directory: git clone source existingDirectory; if it's not an empty directory: you can't.01:30
← albel727 left01:31
← ajustrun left01:31
← CEnnis91 left01:32
→ Sleepy63 joined01:35
→ alanwill joined01:37
john_doe_jr mattcen: well, I got a directory named ~/git/ with a # of git projects...01:37
mattcen john_doe_jr: Each in their own subdir?01:38
← dreiss left01:40
← devoldmx left01:40
→ nucatus joined01:40
← pigeon left01:41
← Lyqyd_ left01:42
← m0ltar left01:44
← nucatus left01:45
← luminous left01:45
→ pigeon joined01:45
← adamben left01:46
← NoNMaDDeN left01:46
john_doe_jr yes01:46
← robinsmidsrod left01:47
→ robinsmidsrod joined01:48
← tier left01:48
mattcen john_doe_jr: So git clone source ~/git/projectname01:50
← ManikM left01:52
→ Manny_ joined01:52
→ tekkbuzz joined01:52
→ Literphor joined01:53
← mtscout6 left01:54
← Literphor left01:55
← tekkbuzz left01:55
→ tekkbuzz joined01:55
← nnyk_ left01:57
→ dreiss joined01:58
→ adamm joined01:58
→ harish joined01:59
john_doe_jr I should have thought of that02:00
→ m0ltar joined02:00
→ EminenceHC joined02:00
→ CEnnis91 joined02:00
← virtualsue left02:02
→ eletuchy joined02:03
← EminenceHC left02:05
→ Lingo__ joined02:05
← nfk left02:07
← eletuchy left02:08
← dorkmafia left02:10
← danemacmillan left02:10
← Noldorin left02:11
← dougsland left02:12
← m0ltar left02:12
→ andrew__ joined02:13
← congruent left02:15
→ devoldmx joined02:15
← polyzen left02:15
→ congruent joined02:16
→ Vampire0_ joined02:16
← CheckDavid left02:17
→ ruukasu joined02:17
→ ehmatthes joined02:19
← Vampire0 left02:20
← tchan left02:21
← Xiti` left02:21
→ Xiti joined02:21
← congruent left02:23
← john_doe_jr left02:24
→ dtrott joined02:24
→ aspiers joined02:26
→ solker joined02:26
→ john_doe_jr joined02:28
← solker left02:30
← aspiers left02:31
→ NosBit joined02:32
← NosBit left02:32
→ NosBit joined02:32
→ unixpro1970 joined02:33
← githogori left02:33
← dtrott left02:34
→ rchavik joined02:35
← b4rbz left02:35
→ wjiang joined02:37
← Prawnzy left02:38
← wjiang left02:38
→ wjiang joined02:39
→ congruent joined02:39
→ echo-area joined02:39
← aidalgol left02:40
← Akagi201 left02:40
→ Takle joined02:41
← devoldmx left02:41
→ nucatus joined02:41
← wrouesnel2 left02:42
→ thedudez0r joined02:42
→ wrouesnel2 joined02:42
← zhxt_work left02:44
← Takle left02:45
← LucasKA left02:45
← nucatus left02:46
→ NoNMaDDeN joined02:46
→ MLM joined02:47
→ nezZario joined02:48
→ mdhopkins joined02:50
← NoNMaDDeN left02:52
← mizu_no_oto left02:54
→ nucatus joined02:57
→ zhxt_work joined02:57
← Lingo__ left02:58
→ boombatower joined02:58
← boombatower left02:58
→ boombatower joined02:58
→ Lingo__ joined02:58
← joedf_phone left02:59
→ jgardella joined02:59
← alp82 left03:01
← gavit left03:01
← tanath__ left03:02
→ devoldmx joined03:02
→ Lingo___ joined03:03
← Lingo__ left03:03
← darkbasic left03:04
← DolpheenDream left03:05
→ darkbasic joined03:05
→ DolpheenDream joined03:05
→ maestrojed joined03:05
→ EminenceHC joined03:05
← boombatower left03:06
→ kadoban joined03:07
← wrouesnel2 left03:07
→ dorkmafia joined03:07
← EminenceHC left03:10
→ moritzschaefer joined03:13
→ lpmulligan joined03:15
← t0th_-___ left03:16
← phantombeta left03:17
← moritzs left03:17
→ Peuc2 joined03:18
← robinsmidsrod left03:18
← moritzschaefer left03:19
← dorkmafia left03:19
Sonderblade any easy way to --amend your penultimate commit?03:19
→ eletuchy joined03:19
→ robinsmidsrod joined03:20
← Peuc left03:20
Peuc2 → Peuc03:20
→ wrouesnel3 joined03:21
← kukks left03:22
← mdhopkins left03:23
→ msankhala joined03:24
← eletuchy left03:24
← dreiss left03:24
→ diegoaguilar joined03:25
← smccarthy left03:25
→ ascarter joined03:26
← unixpro1970 left03:27
→ solker joined03:27
← shinnya left03:28
→ brucelee joined03:28
← pheaver left03:29
← JanC left03:30
← ruukasu left03:31
← solker left03:32
← maestrojed left03:32
→ dreiss joined03:32
← msankhala left03:32
→ shinnya joined03:33
→ kpreid joined03:34
← lacrymology left03:35
→ LifeBlood joined03:35
← alanwill left03:36
→ russt joined03:36
← brucelee left03:37
← Floatingman left03:39
→ brucelee joined03:39
→ blaenk joined03:39
← devoldmx left03:40
blaenk if a merge fails due to conflicts, is there a way to automatically resolve it by accepting 'theirs' for all files? or would git checkout --theirs would need to be used for each file?03:40
← lpmulligan left03:41
→ tmcmahon joined03:41
→ Takle joined03:41
→ dorkmafia joined03:42
→ devoldmx joined03:42
→ pheaver joined03:42
← cwillu_at_work left03:43
← tmcmahon left03:43
← Gitzilla left03:43
→ Gitzilla joined03:44
→ JanC joined03:44
← Takle left03:46
→ Floatingman joined03:48
← russt left03:49
← whomp left03:50
← delight left03:50
→ ajustrun joined03:51
← Manny_ left03:52
→ hgl joined03:52
→ ManikM joined03:52
→ bhuvanaurora joined03:52
← blaenk left03:53
← bhuvanaurora left03:53
→ bhuvanaurora joined03:53
← brucelee left03:54
← ascarter left03:54
→ russt joined03:55
← zanchoPansa left03:57
→ zanchoPansa joined03:57
→ NoNMaDDeN joined03:57
→ kcj joined03:59
← Milkweed left03:59
→ msankhala joined04:00
→ nucatus_ joined04:01
← Consuela left04:01
→ alanwill joined04:02
← devoldmx left04:02
← Lingo___ left04:03
← bhuvanaurora left04:03
← NoNMaDDeN left04:03
← nucatus left04:03
← nucatus_ left04:05
→ nucatus joined04:06
← thedudez0r left04:06
← zumba_addict left04:06
→ zumba_addict joined04:07
← wrouesnel3 left04:07
← m0viefreak left04:08
→ SjB joined04:09
← robinsmidsrod left04:09
→ devoldmx joined04:09
→ robinsmidsrod joined04:11
→ EminenceHC joined04:11
→ bdavenport joined04:13
← kaiza left04:13
← CentaurWarchief left04:13
→ saurabh joined04:13
← yazdmich left04:13
saurabh → Guest5209304:13
→ Lyqyd joined04:14
← Orbitrix left04:14
→ Orbitrix joined04:14
→ CentaurWarchief joined04:15
← EminenceHC left04:16
→ kaiza joined04:16
→ yazdmich joined04:16
← DolpheenDream left04:17
→ mennea joined04:18
→ sinequanon joined04:18
← pheaver left04:19
→ kyb3r_ joined04:20
← Arsonide left04:20
→ Arsonide joined04:20
→ fatalhalt joined04:20
← johtso_ left04:21
← zumba_addict left04:23
→ ruukasu joined04:23
→ zumba_addict joined04:24
→ delight joined04:24
← Arsonide left04:24
→ Arsonide joined04:25
→ solker joined04:28
→ subhojit777 joined04:28
→ nucatus_ joined04:29
→ JosephFerano joined04:29
← nucatus left04:29
← JosephFerano left04:30
→ JosephFerano joined04:31
→ ascarter joined04:32
← robinsmidsrod left04:32
← solker left04:32
→ bhuvanaurora joined04:34
→ robinsmidsrod joined04:34
→ JohnBat26 joined04:35
→ NoNMaDDeN joined04:35
→ thedudez0r joined04:35
← robinsmidsrod left04:35
→ robinsmidsrod joined04:35
← msankhala left04:36
← thedudez0r left04:37
← robinsmidsrod left04:38
← Orbitrix left04:38
→ Orbitrix joined04:39
← bhuvanaurora left04:39
→ Literphor joined04:39
→ robinsmidsrod joined04:39
← Literphor left04:39
→ delight_ joined04:40
← Arsonide left04:40
→ Arsonide joined04:41
→ root3 joined04:41
← delight left04:41
delight_ → delight04:41
→ Anon126 joined04:42
→ nkouevda joined04:42
Anon126 → J1G|Anon12604:43
← robinsmidsrod left04:44
→ robinsmidsrod joined04:44
→ whomp joined04:46
→ thedudez0r joined04:47
← mennea left04:47
→ bhuvanaurora joined04:48
→ mennea joined04:48
→ mizu_no_oto joined04:48
← mizu_no_oto left04:48
← ehmatthes left04:50
← root3 left04:51
← whomp left04:52
← robinsmidsrod left04:53
→ lindenle joined04:53
← Ademan left04:54
→ robinsmidsrod joined04:54
← Dougie187 left04:57
→ Squiggley joined04:58
← lindenle left04:58
→ lathiat joined04:59
← sinequanon left04:59
Squiggley Howdy, I have a silly question here.. Is it possible to create a diff from the original code and a selected commit in a repository? Ignoring the commits that might have happened in between?04:59
← dreiss left05:00
→ sinequanon joined05:00
lathiat Hi Folks, looking for recommendations on tools or documentation about keeping two branches in sync that have known differences. i.e. i'd like to review each commit, and ensure that the changes are either merged into both branches, or, mark them as not being merged back. Anyone got any tips?05:00
kadoban Squiggley: Sure, you can 'git diff somecommit anothercommit'05:00
lathiat Use case is upgrading a project from an older framework version to a newer one, some of the changes I need to make can be made in both, but some will be kept only in the newer tree.05:00
Squiggley hmm05:00
→ maestrojed joined05:01
mattcen Squiggley: "original code"?05:01
Squiggley mattcen: lets say, an initial commit05:02
kadoban: I tried that, but that also includes changes that have transpired between the two commits05:02
I was attempting to isolate the changes that only happened in a particular commit05:02
mattcen Squiggley: in that case, 'git show COMMIT'05:02
← bhuvanaurora left05:03
Squiggley oh lol05:03
thats great!05:03
mattcen: thank you05:03
kadoban: and thank you!05:03
mattcen no problem05:03
→ dtrott joined05:03
kadoban :)05:03
← NosBit left05:04
← thedudez0r left05:05
← sinequanon left05:05
→ t0th_-___ joined05:05
← mennea left05:06
→ mennea_ joined05:06
→ thedudez0r joined05:07
← delight left05:07
→ eletuchy joined05:08
→ beautifulmind joined05:09
← t0th_-___ left05:09
→ durre joined05:10
→ Takle joined05:11
← eletuchy left05:12
← MLM left05:13
← beautifulmind left05:14
← otter768 left05:14
→ EminenceHC joined05:15
← Takle left05:16
Squiggley Here is another silly one, is it possible to consider the state of the repository if commits D,E, and F are considered against A but not including the changes made within B or C?05:16
→ bhuvanaurora joined05:17
← robinsmidsrod left05:18
→ robinsmidsrod joined05:18
→ beautifulmind joined05:19
← EminenceHC left05:20
← Arsonide left05:20
→ Arsonide joined05:20
← JosephFerano left05:21
→ b4rbz joined05:21
← d10n-work left05:21
← beautifulmind left05:22
phy1729 can I use git from my android phone? I'm pretty bored05:22
→ unixpro1970 joined05:24
→ beautifulmind joined05:24
← johnny2600 left05:25
→ GT joined05:26
← bb010g left05:27
← raven-au left05:28
→ arup_r joined05:28
→ solker joined05:28
→ booboy joined05:29
← beautifulmind left05:29
→ arup_r_ joined05:29
← ascarter left05:30
← teran left05:31
→ raven-au joined05:32
← arup_r left05:32
→ beautifulmind joined05:33
← solker left05:33
→ girassolbit joined05:33
← girassolbit left05:33
mattcen phy1729: yes05:34
→ nnyk_ joined05:34
mattcen Squiggley: You want to see the changes made in commits D, E, and F?05:34
← mennea_ left05:35
mattcen Squiggley: if so: git diff D^ F05:36
phy1729 mattcen: how?05:36
→ mennea joined05:36
Squiggley mattcen: this is kind of wacky, but if I wanted to do a diff between F and A, and I want to act like commits B and C never happened05:36
← mennea left05:36
mattcen phy1729: find somebody who's compiled git for android. There are serveral I believe. Check f-droidnorg05:36
Squiggley: see above.05:37
Squiggley like I want to slice out a set of changes05:37
oh, ok, will try that05:37
→ skorgon joined05:38
← skorgon left05:38
→ skorgon joined05:38
← bhuvanaurora left05:38
← a_le left05:38
→ fahadash joined05:39
Squiggley hmm05:39
fahadash Is there any way to make a copy of HEAD without copying .git or any repository-helper files ?05:39
mattcen fahadash: What do you mean "a copy of HEAD"?05:39
→ GitHubIus joined05:40
GitHubIus Hello05:40
gitinfo GitHubIus: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.05:40
mattcen git branch head-backup HEAD05:40
GitHubIus I have a theory question05:40
fahadash mattcen, I want to copy the latest code05:40
mattcen man git-archive05:40
gitinfo the git-archive manpage is available at http://jk.gs/git-archive.html05:40
GitHubIus Say I am Dev #1 and there is also a Dev #205:40
mattcen fahadash: ^^05:40
GitHubIus We have the branches: master / development / feature05:40
Dev #2 is working on feature05:40
mattcen first mistake05:40
← durre left05:41
GitHubIus I want to do something independently of feature, but it will require some code in feature... so I make branch feature-changes05:41
so now we have:05:41
master / development / feature / feature-changes05:41
this is my question05:41
If Dev #2 keeps making changes to feature05:41
how do I keep getting his changes into feature-changes?05:41
mattcen GitHubIus: how did you create feature-changes?05:41
did you just branch off feature?05:41
GitHubIus yes05:41
→ pheaver joined05:42
GitHubIus (I haven't created feature-changes yet - but thats what I intend to do)05:42
mattcen Then you (a) rebase feature-changes on top of feature regularly, or (b) merge feature into feature-changes regularly.05:42
GitHubIus mattcen, is there any upside to one or the other?05:42
mattcen The former is tidier, but rewrites the history of feature-changes which could confuse others if they're also using that branch05:42
the latter is a bit messier, but less surprising05:42
← nnyk_ left05:43
fahadash Thanks mattcen05:43
GitHubIus mattcen, once feature-changes is done, do I just get Dev #2 to merge that back into feature?05:43
what happens to all the merge conflicts between feature and feature-changes, when it merges back into feature?05:43
will all those commits remain?05:44
→ MattMaker joined05:44
mattcen GitHubIus: in theory you should've resolved any conflicts when you merged/rebased feature into feature-changes, and they'll remain resolved when you merge back05:44
Squiggley mattcen: that caret didn't seem to make a difference in output05:44
mattcen looks05:44
GitHubIus mattcen, I'm just trying to think what the git history will look like05:44
every time I merge feature into feature-changes - it'll create a commit for those merge changes correct?05:45
when I merge back, will all of those changes plus the individual commit messages for my other changes be retained?05:45
mattcen Squiggley: The caret looks for the first parent of the commit to which it's applied05:45
Squiggley: In this particular case it's equivalent to a tilde05:45
GitHubIus: yes05:45
GitHubIus ok05:45
thanks05:46
mattcen Unless you rebase, which will not have any merge commits05:46
GitHubIus ok05:46
i might just merge then05:46
→ iamjarvo joined05:46
GitHubIus thank you05:46
mattcen nods05:46
Squiggley I see05:46
mattcen Squiggley: so in the case of your example, my command (git diff D^ F) should've been equivalent to git diff C F,05:47
→ bhuvanaurora joined05:47
→ whomp joined05:47
→ Dewi joined05:48
→ Literphor joined05:49
→ ferr joined05:49
mattcen reminds himself of man gitrevisions as the place that documents all the weird archaic ways of specifying refs, such as commit^N, commit~N, and commit^{x}05:50
Dewi is there a way to move a working copy from one commit to another, but preserving local changes? Equivalent to applying a commit1..commit2 patch, or 'svn up' or 'svn switch'?05:51
← marchdown left05:52
Dewi reset 'hard' and 'soft' choose one or the other, but I want changes to act like a patch05:52
Bombe Dewi, stash, checkout, unstash.05:52
← whomp left05:52
← ManikM left05:52
→ Manny_ joined05:52
→ desposo joined05:53
→ jceb joined05:53
→ marchdown joined05:55
→ EminenceHC joined05:55
Dewi Bombe: thx05:56
← nucatus_ left05:56
Squiggley mattcen: I think what I am looking for might not be possible, its pretty absurd... I was wanting to show the differences in commit F as if the changes from commit E never happened05:56
← john_doe_jr left05:57
mattcen Squiggley: I don't understand.05:57
→ areologist joined05:58
areologist Greetings, friends.05:58
mattcen What you want may be possible, but there's not enough information for me to work out what you want05:58
Squiggley if I do a: show F like you recommended, it will show me the changes that have been made from the previous state E, correct?05:59
← EminenceHC left06:00
← kyb3r_ left06:00
← causasui left06:00
→ kyb3r_ joined06:01
← bhuvanaurora left06:01
→ causasui joined06:01
Squiggley I was wondering if it were possible to show the changes made in F as if the previous state were A, and not E06:01
← veebers left06:01
Squiggley and only the changes within F, nothing from B through E06:02
→ bhuvanaurora joined06:02
← areologist left06:03
← crystal77 left06:03
← UmbraMalison left06:04
mattcen Squiggley: What you're asking for doesn't make sense.06:04
kadoban Squiggley: Unless I'm missing something, that's not actually a meaningful/possible thing.06:04
Squiggley alrighty, my apologies06:04
kadoban And I don't mean "git can't do that", I mean...it just doesn't make sense.06:04
mattcen Squiggley: Either you want to see what changes F introduced (git diff F^ F, or git show F)...06:04
← dtrott left06:04
mattcen Or you want to see what changed between A and F, which is 'git diff A F'06:05
→ UmbraMalison joined06:05
mattcen if you want to see what the entire *tree* would look like if you applied F to A, then take a branch off A, and 'git cherry-pick F'06:05
Squiggley that one06:05
← iamjarvo left06:06
mattcen Well that's how you do it.06:06
Squiggley thank you again, sorry for the incomprehensible thoughts lol06:07
→ eletuchy joined06:08
← desposo left06:09
→ hahuang61 joined06:09
mattcen Squiggley: All good06:12
← eletuchy left06:13
← govg left06:14
← nkouevda left06:15
→ marthinal joined06:17
→ dreiss joined06:18
← maestrojed left06:18
← ferr left06:19
← Arsonide left06:20
→ Arsonide joined06:20
→ Macaveli joined06:20
→ EminenceHC joined06:20
← Macaveli left06:22
→ Consuela joined06:24
← bhuvanaurora left06:24
← EminenceHC left06:25
→ kopparam joined06:25
← Rastus_Vernon left06:27
→ solker joined06:29
← unixpro1970 left06:31
→ teran joined06:31
→ _JohnBat26_ joined06:32
← fatalhalt left06:32
→ ehmatthes joined06:32
← tpollard left06:34
← solker left06:34
→ msankhala joined06:35
← JohnBat26 left06:35
← toothrot left06:36
← teran left06:36
→ kopparam_ joined06:37
← Lyqyd left06:39
→ kriks joined06:39
← kopparam left06:40
→ ThomasLocke joined06:40
→ toothrot joined06:42
← weiyang left06:42
→ lindenle joined06:43
→ BlaXpirit joined06:43
→ pantsman- joined06:44
→ Silmarilion joined06:45
← lindenle left06:47
→ whomp joined06:48
← pheaver left06:49
→ nnyk_ joined06:50
← whomp left06:53
→ barduck joined06:53
→ t0th_-___ joined06:54
→ armyriad joined06:54
→ freimatz joined06:55
→ weiyang joined06:55
← msankhala left06:55
→ PCatinean joined06:56
← dorkmafia left06:56
→ bhuvanaurora joined06:56
→ nucatus joined06:57
← barduck left06:57
← t0th_-___ left06:58
← bhuvanaurora left06:58
← Literphor left07:00
→ bhuvanaurora joined07:00
→ Takle joined07:00
→ faylite joined07:01
→ Raging_Hog joined07:01
← nucatus left07:01
← bhuvanaurora left07:02
→ Literphor joined07:02
← wakd left07:03
→ Marcus joined07:03
→ Novitsh_ joined07:05
← Takle left07:05
→ TomyLobo joined07:05
← diegoviola left07:06
← pantsman- left07:06
← Nijikokun left07:07
← J1G|Anon126 left07:08
← noway_ left07:08
→ stellarhopper joined07:10
← stellarhopper left07:10
→ stellarhopper joined07:10
→ noway_ joined07:12
← _JohnBat26_ left07:12
→ JohnBat26 joined07:12
← ixian8 left07:13
→ nrsk joined07:14
→ otter768 joined07:15
← kopparam_ left07:16
→ FilipNortic joined07:16
→ subhojitpaul21 joined07:18
← Literphor left07:18
← subhojit777 left07:20
← otter768 left07:20
→ NosBit joined07:20
← NosBit left07:20
→ NosBit joined07:20
← Arsonide left07:20
→ Arsonide joined07:20
← NoNMaDDeN left07:21
→ kopparam joined07:21
→ bhuvanaurora joined07:21
← kadoban left07:22
→ acolson joined07:22
→ eletuchy joined07:24
→ flowinho joined07:25
→ EminenceHC joined07:25
→ virtualsue joined07:26
→ maestrojed joined07:27
← beautifulmind left07:29
→ owen1 joined07:29
→ roelmonnens joined07:29
← eletuchy left07:29
← bhuvanaurora left07:30
→ AliRezaTaleghani joined07:30
→ solker joined07:30
← EminenceHC left07:30
→ Sadi joined07:30
→ DrSkyLizard joined07:30
owen1 i need a daily backup of a repo with all it's remote branches. assuming i already run 'git pull', what command can pull all the branches?07:31
← Sadi left07:31
← skorgon left07:31
→ boombatower joined07:31
← boombatower left07:31
→ boombatower joined07:31
→ Sadi joined07:32
→ hexagoxel joined07:32
← CEnnis91 left07:32
→ teran joined07:32
→ mennea joined07:32
→ NoNMaDDeN joined07:33
→ Duikb00t joined07:34
→ punchagan joined07:34
→ Gizburdt joined07:34
← solker left07:35
ojacobson owen1: "pull" is an inappropriate tool for creating backups, usually -- 'git pull' creates new data.07:35
(eg. new merge commits)07:35
← tekkbuzz left07:36
ojacobson If !backup doesn't do what you need, consider 'git clone --mirror' and 'git fetch' in the mirror clone.07:36
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/#backups07:36
← kopparam left07:36
→ bhuvanaurora joined07:36
→ msankhala joined07:36
← teran left07:37
← Sadi left07:37
→ nardev joined07:39
← TomyLobo left07:39
← devoldmx left07:40
← bhuvanaurora left07:41
→ ecky--ptang-zoob joined07:45
→ webguy_ joined07:45
→ devoldmx joined07:46
→ Marcus___ joined07:46
owen1 ojacobson: thanks! i'll read about git clone --mirror07:46
← robinsmidsrod left07:47
← jceb left07:47
← tgunr left07:47
→ robins joined07:47
← webguy left07:48
→ whomp joined07:49
→ jagob joined07:49
← Goplat left07:49
← Marcus left07:50
→ bhuvanaurora joined07:51
→ voidDotClass joined07:51
owen1 ojacobson: i would like to keep the history (commits) so i can't use git clone --mirror );07:52
→ LeMike joined07:52
voidDotClass i've added a file to .gitignore, but i still see it in my repo when i commit.07:52
ojacobson I don't see how those two facts connect.07:52
voidDotClass how do i make it disappear from the repo?07:52
i.e the remote repo07:52
tobiasvl owen1: a mirror retains all history07:52
voidDotClass: !untrack07:52
gitinfo voidDotClass: To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD@{1} file` immediately after pulling / merging07:52
→ ManikM joined07:52
grawity voidDotClass: `git rm` it, commit, push, etc.07:52
← Manny_ left07:52
← robins left07:53
owen1 tobiasvl: is this the correct way to use it? git clone --mirror git@plus:foo/bar.git07:53
(it's not even a git repo anymore)07:53
grawity ...what do you mean, it's not a git repo anymore?07:54
is it a svn repo now?07:54
owen1 (;07:54
grawity I hate you07:54
owen1 i cd into bar.git and it's not a git repo07:54
tobiasvl owen1: it's !bare07:54
ojacobson it's _only_ a git repo07:54
gitinfo owen1: an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/07:54
grawity it's a git repo07:54
ojacobson mirrors don't have a work tree :)07:54
grawity what makes it look like *not* a git repo?07:54
← Squiggley left07:54
ojacobson (however, given a mirror, you can clone it to make a non-bare repo, just like you would the original repository)07:54
← whomp left07:54
ojacobson so, let's back up and look at your original premise07:55
if you have time :)07:55
owen1 grawity: git status didn't work (:07:55
ojacobson _why_ do you need daily backups of the original repository?07:55
(that is, how are you going to use them, once you have them)07:55
→ cbr_ joined07:55
← hexagoxel left07:55
→ nardev_ joined07:55
← maestrojed left07:56
→ robinsmidsrod joined07:56
owen1 someone is asking me to help him backup a repo since he is afraid the original dev will delete it one day07:57
ojacobson a mirror is an appropriate way to do that, then07:57
owen1 right now he is doing it manualy on github.com07:57
ok07:57
← NosBit left07:57
owen1 ojacobson: will i be able to use that mirror in the future and keep it's history?07:57
ojacobson though honestly any random clone is most of a backup; 'git fetch' updates all remote branches, and avoids deleting remote branches unless asked07:57
owen1 i think for speed, i should just git pull of all the remote branches, no?07:58
ojacobson: ^07:58
for remote in `git branch -r`; do git branch --track $remote; done07:58
ojacobson ... you've fundamentally misunderstood what 'git pull' does.07:59
owen1 git pull --all07:59
ojacobson 'git pull' creates merges.07:59
That's its job.07:59
← robinsmidsrod left07:59
owen1 oh no07:59
ok07:59
ojacobson A merge is _necessarily_ not a backup.07:59
(Sometimes, it's wholely new things :)07:59
owen1 ok. so git clone --mirror is better for my case07:59
ojacobson It's probably worth taking the time to run through !gcs -- you need a solid grounding in git's data model for any of this to make sense07:59
gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html07:59
owen1 too bad, since i though getting the delta is quicker07:59
→ tirengarfio joined07:59
ojacobson fortunately, git's data model is not that complicated07:59
it is -- that's what "git fetch" does. Both git clone and git pull use git fetch under the hood; they both do additional work afterwards.08:00
→ palcu joined08:00
→ albel727 joined08:00
owen1 oh. so git clone --mirror is just the first time! than i can just do fetch every night!08:01
→ clauswitt joined08:01
→ robinsmidsrod joined08:01
voidDotClass when you do git rm file, will that remove it on my local hd as well?08:01
→ nilg joined08:01
voidDotClass or will i retain a local copy08:01
← cbr_ left08:02
→ cbr_ joined08:02
tobiasvl voidDotClass: !unstage tells you how to retain a local copy08:04
gitinfo voidDotClass: To unstage a file from the index(in other words, to undo an accidental `git add foo/bar.txt`), use: git reset -- foo/bar.txt08:04
tobiasvl uh sorry08:04
voidDotClass: !untrack08:04
gitinfo voidDotClass: To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD@{1} file` immediately after pulling / merging08:04
→ svector joined08:04
→ dregad joined08:04
← palcu left08:05
voidDotClass tobiasvl: that's a weird ass contradictory thing, it says 'without deleting it from your working tree' and then goes on to say 'that will delete the local copy', wtf?08:05
which one is it?08:05
does it delete it from hd or does it nor08:05
not*08:05
← russt left08:06
tobiasvl you untrack it from your repo without deleting the file08:06
ojacobson voidDotClass: "your working tree" would be the one you use to create the commit; "their working tree" would be those that have the commit replayed into them08:06
tobiasvl then, when you commit and push it, anyone who pulls that change will have it untracked *and* removed08:06
← Gamecubic left08:06
← wookienz left08:06
← darkbasic left08:07
→ darkbasic joined08:07
→ wookienz joined08:08
← bvi left08:08
← Guest79317 left08:09
← dreiss left08:09
→ Guest79317 joined08:09
← Guest79317 left08:09
→ blackmesa joined08:09
→ jnavila joined08:09
→ Nijikokun joined08:09
← Nijikokun left08:09
→ Guest79317 joined08:10
→ Nijikokun joined08:10
→ phyzloc joined08:10
→ lb1a joined08:10
← dregad left08:11
phyzloc I've just cloned a repo. Why do I see this when I do git status? "Your branch and 'origin/ci' have diverged, and have 2 and 3 different commits each, respectively"08:12
← voidDotClass left08:12
← ecky--ptang-zoob left08:12
→ nouranology joined08:12
← wookienz left08:12
→ teran joined08:12
← stfn left08:13
→ stfn joined08:13
← robinsmidsrod left08:13
Seveas phyzloc: then you did more than just clone :)08:14
← juril left08:14
ojacobson phyzloc: !repro08:15
gitinfo phyzloc: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.08:15
→ rath joined08:15
→ robinsmidsrod joined08:15
→ wookienz joined08:15
← msankhala left08:15
→ rob_w joined08:15
phyzloc Seveas: Could be. I ran a script which I was told clones the repo, which you say obviously does more :-/08:16
→ alorence joined08:16
← robinsmidsrod left08:16
→ kopparam joined08:17
← alorence left08:17
→ mlechner joined08:17
→ GGflags joined08:18
→ robins joined08:18
← ManikM left08:20
→ bvi joined08:20
← Arsonide left08:20
→ Arsonide joined08:20
→ TomyWork joined08:21
→ CustosL1men joined08:22
→ jceb joined08:23
→ alorence joined08:24
→ Sadi joined08:24
← Sadi left08:25
← bhuvanaurora left08:25
→ msankhala joined08:25
← carlosr left08:29
→ EminenceHC joined08:29
→ jargon joined08:29
← jeffmjack left08:29
← tirengarfio left08:30
→ govg joined08:30
→ solker joined08:31
→ The_Phoenix joined08:31
→ tomreyn_trav joined08:31
← blackmesa left08:32
← ehmatthes left08:33
tomreyn_trav hi. is there a situation where "git rev-parse <SHA1>" would take half an hour to complete with a rather commonly setup git repository?08:33
← owen1 left08:33
← joki left08:34
tomreyn_trav https://ci.megaglest.org/job/megaglest-source_l64/912/console08:34
02:19:24 > git rev-list 6b35fa1918e3a7f537a59a29780b45a9d281aaea # timeout=1008:34
02:45:2808:34
← EminenceHC left08:34
robins → robinsmidsrod08:35
← ajustrun left08:35
tomreyn_trav this is reaaaally long. on my local computer this command takes a second or two (using a different git version and a slightly different git configuration)08:35
← solker left08:35
← nardev left08:36
← clauswitt left08:37
← drbean left08:37
→ aswen joined08:37
→ delight joined08:40
← kriks left08:40
→ eletuchy joined08:40
→ joki joined08:40
← kopparam left08:40
→ tirengarfio joined08:41
← dialeth left08:41
Seveas tomreyn_trav: you say git rev-parse, but used the command git rev-list08:42
← arup_r_ left08:42
Seveas also, it could be the IRC notifier that takes a long time08:42
→ t0th_-___ joined08:42
tomreyn_trav Seveas: oh sorry, i mean rev-list, not -parse08:43
← kyb3r_ left08:43
→ ronskisika joined08:44
← Raging_Hog left08:44
→ kopparam joined08:44
← cbr_ left08:44
tomreyn_trav and you're right, based on the log it could also be the notifier which takes so long08:44
osse rev-list can take a long time, sure. if thehistory of the project is long08:44
→ juril joined08:44
← eletuchy left08:45
osse it' starts producing output immediately, so it looks fast. but if you pipe it then you won't see that08:45
← lidaaa left08:45
Seveas osse: yeah, but 15 minutes is ridiculous :) I'm blaming the IRC notifier08:45
→ cbr_ joined08:45
← enitiz left08:46
Seveas 02:19:24 > git rev-list 6b35fa1918e3a7f537a59a29780b45a9d281aaea # timeout=1008:46
02:45:28 IRC notifier plugin: There was an error sending notification to: #megaglest08:46
→ nucatus joined08:46
→ skylite joined08:46
← t0th_-___ left08:47
← philipandersen left08:48
→ h4ml3t joined08:48
← francisfish left08:48
→ drbean joined08:48
← metateck left08:49
→ whomp joined08:50
→ netcarver joined08:50
← juril left08:50
← Alenah left08:51
← nucatus left08:51
→ leakybuckit joined08:51
→ avvs joined08:51
→ dorkmafia joined08:52
→ corni joined08:53
→ Takle_ joined08:53
tomreyn_trav hmm yes it seems to be the notifier08:53
→ ixian joined08:53
tomreyn_trav thanks for the help folks08:53
← The_Phoenix left08:54
→ The_Phoenix joined08:55
← whomp left08:55
→ vtunka joined08:56
← dorkmafia left08:57
→ juril joined08:57
← Takle_ left08:58
← rchavik left08:58
→ Takle joined08:58
→ veebers joined08:58
→ owen1 joined08:59
→ arup_r joined09:01
← albel727 left09:01
← thiago left09:01
← kopparam left09:02
← h4ml3t left09:03
→ kopparam joined09:03
← juril left09:05
→ rchavik joined09:05
← St_Marx left09:06
← GitHubIus left09:06
← teran left09:06
← The_Phoenix left09:07
→ clauswitt joined09:07
→ psoo joined09:07
← psoo left09:07
→ BlaXpirit-UA joined09:07
→ psoo joined09:07
← bvi left09:07
← sarri left09:08
→ The_Phoenix joined09:09
→ GGflags_ joined09:09
→ sarri joined09:09
← BlaXpirit left09:10
→ barduck joined09:10
← GGflags left09:11
→ kriks joined09:11
← tomreyn_trav left09:13
→ jheg joined09:13
→ Alenah joined09:14
→ endiruna joined09:15
→ otter768 joined09:16
→ interrobangd joined09:16
→ albel727 joined09:17
← mennea left09:17
← harish left09:17
→ metateck joined09:18
→ basiclaser_ joined09:18
→ h4ml3t joined09:19
→ marcogmonteiro joined09:19
← otter768 left09:20
→ moritzschaefer joined09:20
← The_Phoenix left09:22
← jb55_ left09:23
← Juzzika left09:23
→ jb55 joined09:23
← endiruna left09:24
← nnyk_ left09:25
→ nnyk_ joined09:25
→ teran joined09:26
← LifeBlood left09:26
← ribasushi left09:26
← boombatower left09:27
← darkbasic left09:27
→ cvanball joined09:27
→ darkbasic joined09:27
← jb55 left09:27
← veebers left09:28
← b10s left09:28
← corni left09:29
← owen1 left09:29
← wookienz left09:30
→ DevAntoine joined09:30
← LeMike left09:30
DevAntoine hi09:30
→ davidreis joined09:30
→ philipandersen joined09:30
DevAntoine I've forgotten a file in a previous commit (not the last one). Is it better to amend it or just commit the forgotten file?09:31
→ EminenceHC joined09:31
→ ribasushi joined09:31
→ solker joined09:32
→ juril joined09:32
→ allogeek joined09:32
← jceb left09:32
→ wookienz joined09:33
→ The_Phoenix joined09:34
← ErKa left09:34
← arup_r left09:35
→ nouranology_ joined09:35
← EminenceHC left09:36
← solker left09:36
basiclaser_ hi09:36
← nouranology left09:37
nouranology_ → nouranology09:37
Slush- DevAntoine: have you pushed it?09:37
DevAntoine Slush-: yep09:37
basiclaser_ I am currently in a detached state, and i would like to make this current commit the new HEAD09:37
→ darkbasic_ joined09:37
basiclaser_ i tried git reset (this branch) --hard , but it is still detached09:38
Slush- In that case you need to do a force push with all of it's implications, so I woulf say make a new commit09:38
← darkbasic left09:38
DevAntoine Slush-: fwiw I'm the only one working on this branch09:39
Slush- basiclaser_: git checkout BRANCH; git reset --hard DETACHEDCOMMIT09:39
→ francisfish joined09:39
→ bhuvanaurora joined09:40
Slush- DevAntoine: then I would probably amend the commiy and force push :)09:40
→ huglester_ joined09:40
DevAntoine Slush-: ok )à09:40
=)09:40
→ liamkeily joined09:41
→ nour joined09:41
← wookienz left09:41
← weiyang left09:41
← cebor left09:41
→ jceb joined09:41
← darkbasic_ left09:41
← huglester left09:42
→ cebor joined09:42
← The_Phoenix left09:43
→ darkbasic joined09:43
← freimatz left09:43
→ The_Phoenix joined09:43
→ s8321414 joined09:44
← teran left09:44
→ wookienz joined09:44
← sonOfRa left09:46
← BtbN left09:46
→ BtbN joined09:46
← The_Phoenix left09:48
→ sonOfRa joined09:49
→ jcalonso joined09:49
← juril left09:49
→ ecky--ptang-zoob joined09:50
← jcalonso left09:50
→ jcalonso joined09:51
→ niro joined09:51
→ whomp joined09:51
← kopparam left09:51
← DrSkyLizard left09:52
→ kopparam joined09:52
← bhuvanaurora left09:52
→ LeMike joined09:53
→ mennea joined09:53
→ bhuvanaurora joined09:54
→ jb55 joined09:54
→ NoNMaDDe_ joined09:55
← NoNMaDDeN left09:55
← jb55 left09:56
→ jb55_ joined09:56
← whomp left09:56
← andrew__ left09:56
→ andrew__ joined09:57
← andrew__ left09:57
→ andrew__ joined09:57
← andrew__ left09:57
→ andrew__ joined09:58
← kopparam left09:58
← andrew__ left09:58
→ andrew__ joined09:58
← andrew__ left09:58
→ andrew__ joined09:58
→ dangerousdave joined09:58
← andrew__ left09:58
→ andrew__ joined09:59
← andrew__ left09:59
→ andrew__ joined09:59
→ Evie_Hammond joined09:59
← jb55_ left10:00
← andrew__ left10:00
→ andrew__ joined10:01
← devoldmx left10:01
← andrew__ left10:01
→ andrew_ joined10:02
→ kopparam joined10:02
→ devoldmx joined10:02
← darkbasic left10:03
← andrew_ left10:03
→ andrew_ joined10:03
→ Kicer86 joined10:03
→ wakd joined10:04
→ darkbasic joined10:05
→ vurma joined10:08
← dangerousdave left10:08
→ blackmesa joined10:10
← hgl left10:10
→ beautifulmind joined10:10
→ dangerousdave joined10:12
← jheg left10:13
← ojacobson left10:13
→ Streward joined10:14
→ tak30 joined10:15
← tak30 left10:15
→ Malsasa_ joined10:16
← darkbasic left10:17
← philipandersen left10:17
→ darkbasic joined10:17
→ jheg joined10:17
← gccostabr left10:19
→ knobo joined10:19
← Pyrogerg left10:20
→ duplex joined10:20
← msankhala left10:21
knobo when I'm on branch "foo", and do "git diff master", and I get several differences. some lines with +, and some lines with -. If I do "git merge master" now. are lines that diff showed with - removed, and lines with + added to the foo branch then?10:21
Or is it not so easy as that?10:22
→ IIT joined10:23
← IIT left10:23
→ gccostabr joined10:24
→ simpleuser joined10:26
→ Xethron joined10:27
simpleuser Hi there. If I do a rebase master on a branch, and I do a merge tool, What is LOCAL and what is REMOTE ?10:27
← jgardella left10:27
→ Polyatomic joined10:28
simpleuser Ok, found this http://stackoverflow.com/questions/3051461/git-rebase-keeping-track-of-local-and-remote10:28
→ eletuchy joined10:29
canton7 when you rebase 'branch' onto 'master', git will checkout master then apply successive patches from branch10:29
so LOCAL is the commit on master which git is currently sitting on, and REMOTE is the patch currently being applied from branch10:29
tobiasvl same for you knobo10:29
→ mkaesz joined10:30
→ t0th_-___ joined10:31
→ solker joined10:32
← eletuchy left10:33
→ dougsland joined10:34
→ davidreis_ joined10:34
→ gain joined10:34
→ nucatus joined10:35
← poisond left10:35
← cvanball left10:35
← Arsonide left10:35
→ paul424 joined10:36
→ EminenceHC joined10:36
← t0th_-___ left10:36
← h4ml3t left10:36
← duplex left10:37
← solker left10:37
→ duplex joined10:37
→ Etheco joined10:38
← acolson left10:38
→ hgl joined10:39
← nucatus left10:40
← EminenceHC left10:41
← kopparam left10:42
→ kopparam joined10:43
→ cvanball joined10:44
→ pppp2 joined10:44
← MattMaker left10:44
→ Macaveli joined10:44
→ phantombeta joined10:46
→ harish joined10:47
→ MattMaker joined10:49
→ h4ml3t joined10:49
← Tuna-Fish left10:50
→ acolson joined10:51
→ whomp joined10:52
→ The_Phoenix joined10:52
→ z8z joined10:52
→ dorkmafia joined10:53
→ shigosei joined10:54
← gccostabr left10:54
→ martinklepsch joined10:54
← mkaesz left10:54
← z8z left10:54
← echo-area left10:54
→ z8z joined10:55
→ sebhoss joined10:55
← wookienz left10:55
→ jb55 joined10:56
→ wookienz joined10:56
→ twoface88 joined10:56
← whomp left10:57
← acolson left10:57
← dorkmafia left10:58
← kopparam left10:59
→ ManikM joined10:59
← bhuvanaurora left11:00
→ palcu joined11:01
→ Tuna-Fish joined11:01
← jb55 left11:01
← The_Phoenix left11:01
→ jds joined11:02
← alanwill left11:02
← phyzloc left11:02
→ gavit joined11:03
→ bhuvanaurora joined11:03
→ kopparam joined11:03
→ gccostabr joined11:05
osse knobo: it is not so easy11:05
← Polyatomic left11:05
← nrsk left11:06
← palcu left11:06
→ t0th_-___ joined11:06
→ teran joined11:08
← wookienz left11:08
→ angelsl joined11:09
← angelsl left11:09
→ angelsl joined11:09
← marchdown left11:10
← aarcane left11:10
→ acolson joined11:10
← Malsasa_ left11:10
→ wookienz joined11:11
→ Malsasa_ joined11:12
← Gizburdt left11:14
← blackmesa left11:14
← kopparam left11:16
→ juanmabc joined11:16
← juanmabc left11:16
→ kopparam joined11:16
→ nfk joined11:17
→ otter768 joined11:17
← wookienz left11:17
→ marchdown joined11:18
→ wookienz joined11:18
← Gitzilla left11:19
← kopparam left11:20
← ecky--ptang-zoob left11:20
→ ecky--ptang-zoob joined11:20
← noway_ left11:21
← otter768 left11:21
→ m0viefreak joined11:22
← devoldmx left11:22
→ devoldmx joined11:22
→ mkaesz joined11:24
→ nd__ joined11:25
nd__ Aloha11:25
→ kopparam joined11:25
osse salaam aleykum11:25
← ruukasu left11:26
Malsasa_ → Malsasa11:26
← wjiang left11:26
← acolson left11:27
nd__ I had trouble with an update URL of a submodule and removed the module in `.git/modules/path/mymodule`. It didn't add it back automatically, so I tried to get it with `git clone --bare $URI mymodule` in `.git/modules/path/`. This partly worked, but the clone is missing the `index` and `logs` file, so I cannot get a `git status` in the main repository: `fatal: 'git status --porcelain' failed in submodule path/mys11:28
ubmodule`. Does somebody have a clue how to fix this?11:28
← cvanball left11:30
→ St_Marx joined11:30
← teran left11:31
→ King_Hual joined11:31
→ teran joined11:31
← devoldmx left11:32
→ devoldmx joined11:32
fahadash How do I untrack a folder that has been tracked for so many commits previously ?11:33
not only untrack, I want to remove the database for that folder11:33
→ solker joined11:33
grawity things that involve nuking history tend to be bad ideas11:33
but, git filter-branch11:33
Artpicre Which took should I use to make. A small private Git repository ?11:34
TomyWork git filter-branch shows "WARNING: 'refs/heads/master' was rewritten into multiple commits:" and then the commit message. what's wrong?11:35
Artpicre It'll be on a Raspberry Pi, so GitLab is too big for that11:35
→ Gizburdt joined11:35
TomyWork git filter-branch -f --commit-filter cat11:35
Artpicre Which tool *11:35
grawity Artpicre: `git init`11:35
really, if it's just one user, `git init --bare` and push over SSH11:36
fahadash TomyWork, That would remove the cat folder from the history ?11:36
Artpicre Ew. I meant a git server, not a repository ><11:36
fahadash I could easily accomplish this by deleting the folder I want to untrack (off course keep a backup somewhere), then commit. Then bring the folder back and not --add that again11:36
Artpicre What I write is not what I thought :/11:36
grawity Artpicre: more or less the same thing11:36
at its core, a Git "server" is just any repo that you can push to11:37
for one user, nothing extra is needed11:37
for multiple users, check out Gitolite11:37
Artpicre But for multiple users ?11:37
← solker left11:37
grawity (and if you want a web-based browser, optionally add cgit or gitweb)11:37
fahadash On a separate note, Can git push to SVN or VSTF server ?11:37
Artpicre And how can I manage permissions ?11:38
grawity Artpicre: using Gitolite's permission configuration?11:38
→ blackmesa joined11:38
TomyWork fahadash what?11:38
grawity fahadash: well, `git-svn` has a 'dcommit' subcommand for that11:38
TomyWork no that wasnt a reply to you11:38
Artpicre Okay11:38
Is Gitolite better than Gitorious ?11:39
TomyWork gitlab?11:39
fahadash So git filter-branch will delete a particular item from the history ?11:39
!filter11:39
gitinfo [!filters] Filters can be very useful for automatically making changes to files at checkout(smudge) and checkin/add(clean). See 'man gitattributes' for more information11:39
Artpicre No, GitLab is too big for the RaspberriPi11:39
TomyWork fahadash git filter-branch can do anything to any commit in your history11:39
fahadash !filter-branch11:39
→ acolson joined11:39
fahadash TomyWork, So filter-branch is a command that alters the state of the repo correct ?11:40
→ EminenceHC joined11:40
fahadash Can actions of filter-branch be undone ?11:40
TomyWork read the manpage. for an overview, read at least the examples and their description11:40
fahadash yes but i would recommend a backup11:40
makes things easier11:40
fahadash Ok. I will read up more. Thank you11:40
→ astrofog joined11:41
← gv left11:42
← St_Marx left11:42
→ arnatal joined11:43
TomyWork ugh, commit-filter is clunky11:43
→ gv joined11:44
← robinsmidsrod left11:45
← EminenceHC left11:45
← tirengarfio left11:46
→ St_Marx joined11:46
→ robinsmidsrod joined11:46
← Duikb00t left11:47
lb1a Artpicre, gitolite is perfectly fine for raspberry and perfectly for managing access to repos11:48
→ ssta joined11:48
→ wrouesnel2 joined11:48
Artpicre Okay, thank you all :D11:48
ssta hi. I have "Your branch is ahead of 'origin/master' by 2 commits." and I'd like to throw away those two commits and go back to being in sync with origin/master. How can I do that?11:49
tobiasvl ssta: !revert11:51
gitinfo ssta: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?11:51
← MattMaker left11:51
tobiasvl ssta: see e) and consider doing `git reset --hard origin/master` once you realize what it does11:51
ssta tobiasvl: thank you11:51
← kopparam left11:52
→ noway_ joined11:52
fahadash many of the man pages refer something as 'refs' what is it ?11:52
→ whomp joined11:52
grawity `man gitglossary` – a ref is basically some name attached to a commit11:52
gitinfo the gitglossary manpage is available at http://jk.gs/gitglossary.html11:52
tobiasvl alsp !ref11:53
gitinfo [!treeish] A tree-ish is something that looks like a tree. Read 'man gitrevisions' and http://git-scm.com/book/en/Git-Tools-Revision-Selection11:53
grawity !fail11:53
tobiasvl hm11:53
← nd__ left11:53
fahadash so those hex numbers assigned to each commits are refs ?11:54
← bhuvanaurora left11:54
grawity no, those are the commit IDs themselves11:54
→ freimatz joined11:54
→ tirengarfio joined11:54
grawity refs are the *names* – like the 'master' branch (aka 'refs/heads/master'), or other branches, or tags11:55
fahadash got it11:55
← Sonderblade left11:55
grawity this is pretty much the first sentence of what the glossary says about refs >_>11:55
← dsdeiz left11:56
→ jb55 joined11:57
← whomp left11:57
fahadash git filter-branch 'rm -rf src/unwanted-folder' is what I am looking for11:58
→ jcalonso_ joined11:59
→ eletuchy joined11:59
← paul424 left12:01
← netj_ left12:01
→ bhuvanaurora joined12:01
→ kopparam joined12:01
← ManikM left12:02
← ssta left12:02
→ palcu joined12:02
← devoldmx left12:02
← jb55 left12:02
← jcalonso left12:02
→ juril joined12:02
← blackmesa left12:02
→ devoldmx joined12:03
→ palcu_ joined12:03
→ netj joined12:04
← eletuchy left12:04
→ enitiz joined12:06
→ adamretter joined12:06
← palcu left12:06
adamretter If I have rebased Branch C onto Branch B, is it possible to undo that and rebase it onto Branch A?12:06
← tirengarfio left12:07
osse adamretter: assuming C is checked out: git rebase --onto=A B12:07
TomyWork certain team members have their own SVN commit style. now that i'm converting to git, i want to automatically rewrite their messages to fit git commit message format rules12:08
→ fightback joined12:08
TomyWork can i detect the user in a msg-filter?12:08
grawity $GIT_AUTHOR_EMAIL should work12:08
→ lindenle joined12:08
TomyWork good12:08
adamretter osse: nice one :-)12:09
← Evie_Hammond left12:10
→ soooga joined12:10
← soooga left12:11
→ Evie_Hammond joined12:11
→ soooga joined12:11
← Xethron left12:11
osse adamretter: is is re-rebasing it though. to answer your question at face value: git reset --hard C@{1}; git rebase A12:12
→ noway__ joined12:12
→ adamben joined12:13
avtobiff adamretter, or use git reflog12:13
← fightback left12:13
← lindenle left12:13
adamretter osse: rebase is fine here its a personal repo12:13
← shinnya left12:14
→ Xethron joined12:14
← Xethron left12:14
→ Xethron joined12:14
← interrobangd left12:14
← soooga left12:14
osse adamretter: sure, but "re-rebasing" it, instead of starting over, might not be the thing you want, if for example you solved some conflicts or skipped some commits during the first rebase.12:15
← Evie_Hammond left12:15
osse which wouldn't have been necessary if you rebased onto the correct branch initially12:15
→ mizu_no_oto joined12:15
adamretter osse: nope it was just about a single commit which should have been in a seperate branch12:15
← noway_ left12:16
osse yeah I get that in this case it was fine.12:16
Just saying it might not be fine in all cases12:16
→ wrksx joined12:17
wrksx when I do git branch -av I have a strange thing showin up:12:17
remotes/hub/master 85bd7a4 removed all content12:17
what is that ?12:18
← kopparam left12:18
osse wrksx: it's the master branch at the remote called 'hub'12:18
jast !rtb12:18
gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote12:18
jast whoops, that one is a bit too long12:18
wrksx jast: nono that's nice12:19
jast it gets cut off by IRC, though12:19
wrksx damn =)12:19
jast: I'm not sure to get it, is this branch used somehow when I do a git pull origin master ?12:19
osse no12:19
wrksx meant git pull hub master12:20
jast not exactly12:20
→ Duikb00t joined12:20
osse it will be updated as part of the underlying fetch. otherwise no.12:20
wrksx I don't know why it is there12:20
this branch12:20
jast you know how pull is actually a combination of fetch+merge?12:20
wrksx I read about that12:20
jast fetch's job is to grab all the branches from the remote repo, and stuff them in this remotes namespace12:20
→ shinnya joined12:21
→ kopparam joined12:21
jast merge takes stuff from there (or any other branch/tag/commit you give it if you run it on its own) and combines it with your checked out branch12:21
when you run just 'git pull', that's pretty much exactly what it does, automatically figuring out which branch to merge12:21
wrksx what is weird is that the temote tracked branch (remotes/hub/master 85bd7a4 removed all content) points to an old commit12:22
jast when you run 'git pull hub master' (for instance), it does the same thing but doesn't actually use the remotes/hub/master thing for the merge12:22
wrksx Idk how did I do that12:22
← cbr_ left12:22
jast run a 'git fetch' and see if that brings you up to speed12:22
← kcj left12:22
← kermit left12:22
jast some time ago 'git fetch' and 'git pull' with remote/ref args didn't actually update the remote-tracking branch, just the man in the middle thing used by 'git merge' (called FETCH_HEAD)12:23
since that tends to confuse people it's been changed some time ago12:23
→ kermit joined12:23
wrksx jast: alright, now the remote tracked branch is pointing to the last commit12:23
→ nucatus joined12:23
wrksx jast: but I think i really do not need that branch, do I ?12:24
jast well, it can be handy for comparing different branches, seeing what's where and what isn't, stuff like that12:24
wrksx I wondered if it was created when I was messing around in detached mode12:24
→ curiousmansi_ joined12:24
jast many people like looking at what they're merging before actually merge, and the two-step procedure is very useful for that12:24
wrksx yeah I get it12:25
jast well, a detached HEAD on its own doesn't go around and create remote-tracking branches12:25
but 'git fetch' does :)12:25
← pppp2 left12:25
jast in any case, there is virtually no disk space overhead12:25
wrksx fact is after messin around in detached mode, I tried to get back to the letest rev with a git pull that triggered a merge etc...12:26
latest12:26
git branch -d remotes/hub/master should remove the remotly tracked branch, right ?12:26
→ msankhala joined12:26
← ronskisika left12:26
wrksx but it won't cut the branch on the hub repo12:26
jast sure, but the next fetch will bring it back12:27
wrksx hum12:27
jast there's not that much of an advantage in removing it, really12:27
wrksx jast: ok so i'll try that just to see it happen and get a better undersztanding12:27
← NoNMaDDe_ left12:27
wrksx jast: can't remove that branch remotes/hub/master fd18ce0 test12:28
← nucatus left12:28
← toothrot left12:28
jast oh, yeah... I think you need -r -d12:28
← Macaveli left12:28
→ ManikM joined12:29
jast (r for 'remote' :))12:29
← kloeri left12:29
→ kloeri joined12:29
wrksx git is actually very subtle12:29
osse it'll just reappear when you fetch12:29
unless you change the refspec12:29
← ManikM left12:29
← kopparam left12:29
jast great, now you have to explain what a refspec is, and off we go into the rabbit hole ;)12:29
→ jonatasnona joined12:29
wrksx error: remote branch 'remotes/hub/master' not found.12:30
→ ManikM joined12:30
wrksx don't get it12:30
jast you may have to say 'hub/master'12:30
← jstemmer left12:30
jast I'm not sure either way, because I never manually delete remote-tracking branches12:30
wrksx jast: ah ok, remote for sure is not part of the branch name12:30
jast well technically it is :}12:30
wrksx ah12:30
jast internally, your local 'master' is stored as refs/heads/master, and hub/master is stored as refs/remotes/hub/master12:31
wrksx so that's doesn't really make sense12:31
ah ok12:31
the fact I use -r anyway makes git aware that I'm working on remote branches12:31
jast my guess is -r simply switches the internal refs/heads/ prefix over to refs/remotes/ when doing its thing12:31
← wookienz left12:31
wrksx what I thought12:31
→ toothrot joined12:32
jast btw this is analogous to how 'git branch -r' shows you remote-tracking branches, i.e. without the remotes/ prefix12:32
→ luksaur joined12:32
→ wookienz joined12:33
wrksx jast: yes in that that makes perfect sense12:33
jast so it all fits... mostly12:33
wrksx yeah12:33
→ cbr_ joined12:33
← nikita left12:33
wrksx jast: osse: thaks for your help guys12:34
* thanks12:34
jast you're welcome12:34
→ solker joined12:34
jast please hold while I track down your invoicing address12:34
wrksx sure12:35
=)12:35
Ok I deleted that branch, and did a fetch and it's back again. All good.12:36
→ cagedwisdom joined12:36
→ nikita joined12:36
← _5kg left12:36
wrksx Now I removed that branch again, and did a git pull hub master12:36
and it didn't recreated that strange remote track branch12:36
TomyWork hnnng, why is commit-filter run after msg-filter12:36
← yano left12:37
← solker left12:38
→ DaisyTheCow joined12:39
← ManikM left12:40
→ rnsanchez joined12:40
← DaisyTheCow left12:40
jast TomyWork: probably because it needs the commit message... just a guess, though :)12:40
→ tirengarfio joined12:40
TomyWork yeah i see that now :)12:41
← tirengarfio left12:41
TomyWork also, looks like index-filter runs before msg-filter12:41
wrksx git is just beautiful12:41
← phantombeta left12:41
→ eric___ joined12:41
TomyWork so i could set the author info there12:41
→ Macaveli joined12:42
→ Malsasa_ joined12:42
← Malsasa left12:42
TomyWork ...but that wont end up in the commit...12:43
→ phantombeta joined12:43
→ Evie_Hammond joined12:43
→ EminenceHC joined12:43
→ goTAN joined12:43
Malsasa_ → Malsasa12:44
← Guest21879 left12:46
→ ionelmc joined12:47
→ tirengarfio joined12:48
← EminenceHC left12:48
→ achadwick joined12:49
→ durre joined12:50
← Marcus___ left12:51
→ soreau joined12:51
→ NoNMaDDeN joined12:51
soreau Hi, is there an easy way to output a list of revisions from a particular contributer?12:52
← freimatz left12:52
← marchdown left12:52
j416 soreau: git log --author="particular contributor"12:52
soreau j416: Thanks :)12:53
j416 o/12:53
→ johtso_ joined12:53
→ ManikM joined12:53
→ whomp joined12:53
← liamkeily left12:53
revolve_ → revolve12:53
→ aspiers joined12:53
→ nucatus joined12:54
→ dorkmafia joined12:54
← andrew_ left12:54
← smw left12:56
← nikita left12:57
← Macaveli left12:57
← vtunka left12:58
→ jb55 joined12:58
← whomp left12:58
← clauswitt left12:58
→ dsdeiz joined12:58
← nucatus left12:58
→ marchdown joined12:58
← dorkmafia left12:59
← ghoti left12:59
→ nikita joined12:59
→ palcu__ joined12:59
→ clauswitt joined13:00
← moritzschaefer left13:00
← zenithdk left13:00
← jcalonso_ left13:00
→ ghoti joined13:00
← sebhoss left13:00
→ tvw joined13:00
→ fstd_ joined13:01
→ sburgess joined13:01
← nfk left13:01
← palcu_ left13:02
← jb55 left13:02
← robinsmidsrod left13:04
→ robinsmidsrod joined13:04
← fstd left13:04
fstd_ → fstd13:04
← s8321414 left13:04
← robinsmidsrod left13:04
← jargon left13:05
→ s8321414 joined13:05
← adamben left13:05
← Nijikokun left13:05
← darkbasic left13:06
→ The_Phoenix joined13:06
→ darkbasic_ joined13:06
→ cannonball joined13:06
← dangerousdave left13:06
→ mikecmpbll joined13:06
→ robinsmidsrod joined13:06
→ LucasTT joined13:07
→ jargon joined13:08
← tirengarfio left13:09
← BlaXpirit-UA left13:11
→ BlaXpirit joined13:11
→ nfk joined13:11
→ tirengarfio joined13:11
← aspiers left13:12
← affa09 left13:13
→ m0ltar joined13:13
→ tristanp joined13:13
→ Malsasa_ joined13:13
← Malsasa left13:14
← mlechner left13:14
→ DanMAbraham joined13:14
→ mlechner joined13:15
→ dangerousdave joined13:16
→ otter768 joined13:18
→ liamkeily joined13:19
TomyWork "git svn find-rev r12345" says "Unable to determine upstream SVN information from HEAD history". I did some rebasing and filterbranching so i kinda expected that. however, i only rewrote commit messages and authors, so i'd like to reassociate the svn and git commits, if possible.13:19
← huglester_ left13:19
→ huglester joined13:20
→ listochkin joined13:20
← beautifulmind left13:20
→ _5kg joined13:21
← JDHawke left13:22
→ shigoseii joined13:22
← subhojitpaul21 left13:22
← otter768 left13:22
→ mytec joined13:23
← elcheckito left13:23
→ palcu joined13:23
→ aspiers joined13:24
→ Marcus_ joined13:24
c74d → Guest1307113:24
← mattl left13:24
← flowerhack left13:24
→ darkbasic joined13:24
← shigosei left13:24
← kapowaz_ left13:24
← lacrosse__ left13:24
← robmozart_ left13:24
← eeeeeta left13:24
← tfnico____ left13:24
← faheem_ left13:24
← [diecast] left13:24
← hguux_ left13:24
← ZucchiniZe left13:24
← devhost left13:24
← lebster left13:24
← mehdi left13:24
← akitada left13:24
← Guest13071 left13:25
← ariver left13:25
← ocharles_ left13:25
← tm512 left13:25
→ russt joined13:25
→ flowerhack joined13:25
→ apipkin_ joined13:25
→ kapowaz_ joined13:25
← darkbasic_ left13:25
← basiclaser_ left13:25
← Novitsh_ left13:25
← apipkin left13:25
← hellschreiber left13:25
← sadmac left13:25
← Hello71 left13:25
← SleePy left13:25
← shennyg left13:25
← Hipska left13:25
← da5id left13:25
← edenist left13:25
→ shennyg_ joined13:25
← michael_mbp left13:25
→ c74d joined13:25
→ basiclaser_ joined13:25
← palcu__ left13:25
→ michael_imac joined13:25
→ eeeeeta joined13:25
→ tm512 joined13:26
→ faheem_ joined13:26
→ lacrosse__ joined13:26
← ams_ left13:26
← scalability-junk left13:26
→ [diecast] joined13:26
→ ams__ joined13:26
→ Novitsh_ joined13:26
→ tfnico____ joined13:26
→ ocharles_ joined13:26
→ devhost joined13:26
→ lebster joined13:26
→ Hipska joined13:26
→ robmozart_ joined13:26
→ ZucchiniZe joined13:26
→ akitada joined13:26
→ scalability-junk joined13:26
→ ariver joined13:27
apipkin_ → apipkin13:27
→ edenist joined13:27
→ hguux_ joined13:27
→ Hello71 joined13:27
→ hellschreiber joined13:27
→ vtunka joined13:27
→ mattl_ joined13:27
shennyg_ → shennyg13:27
→ SleePy joined13:27
→ da5id joined13:27
→ mehdi joined13:27
gitinfo set mode: +v13:27
→ ruukasu joined13:28
→ Marcus___ joined13:28
→ sadmac joined13:28
← DanMAbraham left13:29
← m0ltar left13:29
→ mellernoia joined13:29
← SwedFTP left13:29
c74d → Guest1055213:29
→ adamben joined13:30
→ SwedFTP joined13:30
→ c74d joined13:30
← Marcus_ left13:31
← mytec left13:31
← Guest10552 left13:31
← wrksx left13:32
→ hcc23 joined13:32
Malsasa_ → Malsasa13:33
← bhuvanaurora left13:34
→ solker joined13:35
→ darkbasic_ joined13:35
← darkbasic left13:35
→ jatt joined13:36
← jatt left13:37
→ mribeirodantas joined13:38
← listochkin left13:38
← solker left13:39
→ bhuvanaurora joined13:39
← dsdeiz left13:40
→ listochkin joined13:41
→ kadoban joined13:41
→ elcheckito joined13:41
← ap0c left13:42
← tirengarfio left13:42
← mlechner left13:43
← jason237 left13:43
← Guest52093 left13:45
→ jerius joined13:45
→ EminenceHC joined13:45
← martinklepsch left13:45
← elcheckito left13:46
→ sebhoss joined13:46
← kadoban left13:47
→ kadoban joined13:47
← listochkin left13:47
→ eletuchy joined13:48
← _5kg left13:48
→ iamjarvo joined13:48
→ mlechner joined13:48
← EminenceHC left13:50
← niro left13:50
→ sooheon joined13:50
← cagedwisdom left13:51
← mribeirodantas left13:51
→ Rampages joined13:51
← eletuchy left13:52
→ EminenceHC joined13:53
→ nrsk joined13:53
→ whomp joined13:54
→ nucatus joined13:54
→ tier joined13:55
→ knownasilya joined13:55
→ tirengarfio joined13:57
← EminenceHC left13:57
← aswen left13:57
← whomp left13:59
→ jb55 joined13:59
→ elcheckito joined13:59
← iamjarvo left13:59
← nucatus left13:59
→ IrishPrime joined14:00
← jb55 left14:00
→ jb55 joined14:00
← msankhala left14:03
← darkbasic_ left14:04
→ ErKa joined14:04
← dangerousdave left14:05
→ sinkensabe joined14:05
← jb55 left14:05
→ kopparam joined14:06
← sooheon left14:06
→ danemacmillan joined14:06
← The_Phoenix left14:06
← AliRezaTaleghani left14:07
→ AliRezaTaleghani joined14:07
← AliRezaTaleghani left14:07
→ darkbasic joined14:07
← manumoomoo left14:08
← avvs left14:08
→ The_Phoenix joined14:08
← thedudez0r left14:09
← Gizburdt left14:09
→ delboy1978uk1 joined14:09
delboy1978uk1 how do i pull latest changes from the github repository i forked from?14:09
→ Gizburdt joined14:09
TomyWork have you tried git pull?14:09
danemacmillan Did you add it as a remote?14:10
← davidreis left14:10
delboy1978uk1 yeah but that pulls from my fork14:10
TomyWork (assuming you mean "cloned", not "forked")14:10
(ok, you do not)14:10
danemacmillan When you add it as a remote, you just do git pull remote-name14:10
delboy1978uk1 actually think i found it? git merge upstream/master14:10
TomyWork delboy1978uk1 you'd have to tell git what "upstream" means, if you havent already14:10
delboy1978uk1 let mr try :)14:10
me14:10
→ tmcmahon joined14:11
→ listochkin joined14:11
← s8321414 left14:11
→ manumoomoo joined14:11
TomyWork github should really offer that on their web interface14:11
delboy1978uk1 ok didnt work lol14:11
i know14:11
TomyWork maybe they do now... ask #github14:11
or maybe they have a guide for that14:11
delboy1978uk1 git remote add upstream [URL]14:11
danemacmillan delboy1978uk1: yes14:12
You need to add it as a remote.14:12
← rchavik left14:12
→ yano joined14:12
← clauswitt left14:12
TomyWork delboy1978uk1 you should really try looking for a guide on github's help pages14:12
there probably is one14:13
← The_Phoenix left14:13
← Gizburdt left14:13
← sarri left14:14
→ crose joined14:14
→ Gizburdt joined14:14
← tirengarfio left14:14
← jerius left14:14
→ martinklepsch joined14:14
→ The_Phoenix joined14:15
← mizu_no_oto left14:15
← Gizburdt left14:15
→ sarri joined14:16
→ joo-_ joined14:16
→ dangerousdave joined14:17
→ Pdiddy3g joined14:17
delboy1978uk1 TomyWork: got it https://help.github.com/articles/syncing-a-fork/14:17
→ iamjarvo joined14:17
→ polyzen joined14:17
← Pdiddy3g left14:17
← delboy1978uk1 left14:18
← The_Phoenix left14:18
→ dsdeiz joined14:18
→ The_Phoenix joined14:19
← The_Phoenix left14:19
→ The_Phoenix joined14:19
← jonatasnona left14:20
→ Gizburdt joined14:20
→ aswen joined14:21
← z8z left14:21
→ thedudez0r joined14:22
→ tirengarfio joined14:23
→ ascarter joined14:24
← roelmonnens left14:24
→ derringur joined14:24
→ roelmonnens joined14:24
← russt left14:25
← iamjarvo left14:26
← shinnya left14:26
← adamretter left14:26
→ buffal0 joined14:28
→ CEnnis91 joined14:28
→ livingstn joined14:28
← dangerousdave left14:28
← ManikM left14:29
→ ManikM joined14:29
→ chrisgeo joined14:31
→ crystal77 joined14:31
← joo-_ left14:31
→ dangerousdave joined14:32
← palcu left14:33
→ _5kg joined14:33
← buffal0 left14:33
← darkbasic left14:34
→ darkbasic joined14:34
→ solker joined14:35
← dsdeiz left14:35
→ buffal0 joined14:36
→ JosephFerano joined14:36
→ timini_ joined14:36
timini_ Hi how can I change all my commits into a since commit?14:37
osse timini_: git reset --soft HEAD~10; git commit14:37
timini_: that will work if they are all on a single line14:38
consecutive14:38
← sword` left14:38
← mlechner left14:38
→ freimatz joined14:38
← solker left14:40
→ joo-_ joined14:40
→ Macaveli joined14:41
→ palcu joined14:41
← joo-_ left14:41
← The_Phoenix left14:42
→ d10n-work joined14:42
← darkbasic left14:43
→ darkbasic joined14:43
→ whomp joined14:44
→ meltdown joined14:44
← tmcmahon left14:45
← bhuvanaurora left14:48
← whomp left14:48
← curiousmansi_ left14:49
→ millr|wrk joined14:49
→ pmallya joined14:49
← pmallya left14:50
→ Milkweed joined14:50
→ EminenceHC joined14:50
→ thedodd joined14:50
→ pmallya_ joined14:50
← tirengarfio left14:52
→ iamjarvo joined14:53
→ subhojit777 joined14:54
→ tier_ joined14:54
→ dorkmafia joined14:55
← EminenceHC left14:55
→ DanMAbraham joined14:55
→ nucatus joined14:56
→ ehynds joined14:57
← tier left14:57
DanMAbraham → moarrr14:57
→ maestrojed joined14:57
← knobo left14:57
→ jatt joined14:58
← dangerousdave left14:58
← dorkmafia left14:59
→ tranzfuse joined14:59
← webguy_ left15:01
→ jb55 joined15:01
← tranzfuse left15:01
→ russt joined15:02
→ tranzfuse joined15:02
← durre left15:02
← jceb left15:02
→ webguy joined15:03
timini_ cool thanks15:04
→ upene joined15:05
→ DrSkyLizard joined15:05
← jb55 left15:05
← netcarver left15:06
→ steele joined15:07
→ jnavila_ joined15:07
→ AaronMT joined15:08
← soreau left15:08
→ CheckDavid joined15:09
→ eletuchy joined15:09
← fstd left15:10
sybariten dang15:10
← rob_w left15:10
sybariten yesterday i found a git tutorial at home, saved the URL in a txt file there, but now at work i find like 10 different other tutorials about the same subject, but not this specific one15:10
the google-fu is weak in this one15:11
→ craigp joined15:11
← jnavila left15:11
← iamjarvo left15:11
→ fstd joined15:12
← ascarter left15:12
→ its-martin joined15:12
← craigp left15:12
→ rpg joined15:12
→ ascarter joined15:13
→ kukks joined15:13
← wookienz left15:13
→ moritzschaefer joined15:14
→ Technocrat joined15:15
→ awkwardusername joined15:15
→ wookienz joined15:15
← Consuela left15:16
← virtualsue left15:16
its-martin I checked out upstream/develop by typing git checkout -b upstream/develop without another name. now I have two upstream/develop when I do something like git branch -a, which causes problems. How can I undo this?15:17
osse its-martin: delete it15:17
git branch -d upstream/develop15:17
→ axl_ joined15:18
its-martin osse, That's what I figured, but it made mea little nervous it would also try to delete my remote or something15:18
→ jceb joined15:18
→ m4tthumphrey joined15:18
m4tthumphrey yo yo yo15:18
→ Spacew00t joined15:18
→ otter768 joined15:18
m4tthumphrey is it possible to revert my (clean) working copy to a previous commit but without rewriting (resetting) history?15:19
→ dreiss joined15:19
its-martin osse, Worked fine it looks like. Nervous for no reason. Thank you!!15:19
kadoban m4tthumphrey: You can use 'git revert', but it doesn't revert to a particular state, it reverts commit(s)15:20
osse m4tthumphrey: git checkout <commit> -- .15:20
with the dot, assumnig you're at the top level15:20
→ bracero joined15:21
m4tthumphrey thank you guys!15:21
← sebhoss left15:21
m4tthumphrey i thought it’d be todo with checkout15:21
what does the “—“ bit do osse?15:21
--15:22
osse !--15:22
gitinfo [!dashes] Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"15:22
m4tthumphrey ah i see15:22
osse I don't think it is needed in this case because there's no ambiguity15:22
but it doesn't hurt15:22
→ dfedde joined15:22
← thedodd left15:22
m4tthumphrey yep makes sense15:22
← dfedde left15:23
← eric___ left15:23
← otter768 left15:24
→ Ankhers joined15:24
→ iamjarvo joined15:24
← GT left15:25
→ dfedde joined15:25
← nouranology left15:26
→ The_Phoenix joined15:29
→ dangerousdave joined15:29
← jceb left15:29
← crystal77 left15:29
← The_Phoenix left15:30
→ jcalonso joined15:30
← dangerousdave left15:30
→ Pyrogerg joined15:30
← teran left15:31
→ teran joined15:31
→ Akagi201 joined15:32
← ascarter left15:33
← Guest79317 left15:35
→ Guest79317 joined15:35
← Gizburdt left15:36
→ solker joined15:36
→ alanwill joined15:36
→ Sadi joined15:36
← Guest79317 left15:37
← NoNMaDDeN left15:37
→ The_Phoenix joined15:37
← LucasTT left15:37
→ aartist joined15:37
→ Skapadapaduu joined15:38
→ NoNMaDDeN joined15:38
← crose left15:38
→ jonmasters joined15:38
← kopparam left15:38
← eletuchy left15:38
→ RTG` joined15:39
→ eletuchy joined15:39
← t0th_-___ left15:39
← timini_ left15:40
← solker left15:40
← upene left15:41
→ upene joined15:41
← alanwill left15:41
→ sebhoss joined15:41
→ jceb joined15:41
→ jiskiras joined15:42
→ Gizburdt joined15:43
→ lindenle joined15:43
→ smccarthy joined15:43
← tranzfuse left15:43
← moritzschaefer left15:43
← eletuchy left15:44
← listochkin left15:44
← Sadi left15:44
→ cvanball joined15:44
→ dangerousdave joined15:44
← dangerousdave left15:44
→ whomp joined15:45
← GarethAdams left15:46
← EvilPenguin left15:46
→ dangerousdave joined15:47
← mkaesz left15:47
→ GarethAdams joined15:47
→ tranzfuse joined15:47
← tranzfuse left15:47
← dangerousdave left15:47
→ mkaesz joined15:47
→ tranzfuse joined15:47
← lindenle left15:47
→ SadiQ_ joined15:48
rivarun with `git add -p`, can i go directly to the editor, with _all_ the hunks?15:48
← sinkensabe left15:48
← kukks left15:49
→ pheaver joined15:49
→ acharlieh joined15:49
→ dangerousdave joined15:49
← DrSkyLizard left15:49
← dangerousdave left15:50
← svector left15:50
kadoban rivarun: Don't think so15:50
← ehynds left15:51
rivarun kadoban: oh, looks like i need `git add -e`15:51
← mkaesz left15:52
→ jonatasnona joined15:52
→ joo-_ joined15:52
→ EminenceHC joined15:53
kadoban rivarun: Huh, neat. I didn't know that existed15:54
← rath left15:54
→ msankhala joined15:54
rivarun kadoban: it's missing the help text at the bottom, but there's better documentation in the manpage anyway15:54
→ cwillu_at_work joined15:56
→ Noldorin joined15:58
← gavit left15:58
← EminenceHC left15:58
← Derega left15:58
→ MLM joined15:58
← pheaver left15:59
→ KONIG joined15:59
← upene left15:59
← jargon left16:00
rivarun kadoban: ouch. if the patch does not apply, it doesn't let you continue from where you left off16:00
← roelmonnens left16:00
← FilipNortic left16:01
→ jb55 joined16:02
← punchagan left16:02
kadoban rivarun: Doh. I guess you can manually save it, but that kinda sucks.16:02
← acolson left16:02
← allogeek left16:03
→ WORMSS joined16:03
→ [H]unt3r joined16:03
→ pheaver joined16:03
→ t0th_-___ joined16:03
← Silmarilion left16:03
→ ehmatthes joined16:04
WORMSS Is "git merge -s --no-ff octopus a b d" supposed to state that you are fast forwarding the first branch, even though you have told it not to, and the log confirms you have not.16:04
opps, -s octopus --no-ff sorry16:04
← vtunka left16:05
← mennea left16:05
→ SumDude joined16:05
← martinklepsch left16:05
← nilg left16:05
← moarrr left16:05
rivarun kadoban: ontop of that, i've had very little luck with editing these. 95% of my patches don't apply even if i follow the instructions and i'm often stuck trying to stage a trivial patch16:06
→ gavit joined16:06
→ geekbri joined16:06
← jb55 left16:07
kadoban rivarun: Yeah, it might be better using -p and doing it piece by piece unless you're god at diff format. Even then it can be prett easy to confuse yourself16:07
rivarun kadoban: the problem with hunks is that you can't split them indefinitely16:07
← jatt left16:07
→ LifeBlood joined16:07
← Gizburdt left16:09
kadoban rivarun: Right, but usually you can get it down to a few lines at a time16:09
→ crystal77 joined16:09
→ kpease joined16:10
rivarun kadoban: hm. i guess that helps with smaller diff changes. let me try16:10
← cvanball left16:10
→ mribeirodantas joined16:11
← psoo left16:11
← LeMike left16:11
→ a_le joined16:12
→ chrisshattuck joined16:12
← ThomasLocke left16:12
→ Dirkos joined16:12
Dirkos I have a problem with my git that everytime i do a push i see a change on the complete file16:13
← crystal77 left16:13
Dirkos so it kinda replaces the whole file16:13
moritz Dirkos: sounds like an !eol issue16:13
gitinfo Dirkos: The option/attribute to use when you need to care about different line-endings in your file: http://timclem.wordpress.com/2012/03/01/mind-the-end-of-your-line/16:13
→ Gamecubic joined16:13
← fr33domlover left16:14
→ punchagan joined16:14
→ crystal77 joined16:14
→ Derega joined16:14
→ dangerousdave joined16:15
→ n-st joined16:15
← jceb left16:16
→ Bryzzle joined16:16
→ eletuchy joined16:17
→ jb55 joined16:19
← Derega left16:19
→ sinkensabe joined16:21
→ Derega joined16:22
← pheaver left16:23
→ Prawnzy joined16:24
← bracero left16:24
← Dirkos left16:24
← zumba_addict left16:26
→ zumba_addict joined16:27
← likewhoa left16:27
→ Narfinger joined16:28
← Duikb00t left16:28
Narfinger hiho, what would be the commandline to add something like [http "https://foo.bar"] sslCAInfo=/baz?16:28
← nnyk_ left16:28
canton7 jast, gitinfo isn't in #github or #gitolite?16:29
← ManikM left16:29
jast .join16:29
gitinfo jast: Auto-joined configured channels: #bitbucket, #gitolite, #github, #git, #git-devel16:29
→ ManikM joined16:29
canton7 ignore me, I'm blind16:30
><16:30
jast :)16:30
→ tgunr joined16:30
← Derega left16:31
← joo-_ left16:31
← iamjarvo left16:33
→ mihaicris joined16:33
→ eric___ joined16:34
→ iamjarvo joined16:34
→ thiago joined16:34
← nucatus left16:34
→ Zupoman joined16:35
← alorence left16:35
← Narfinger left16:35
→ adamretter joined16:36
← hgl left16:37
← jiskiras left16:37
→ solker joined16:37
→ ferri joined16:37
← mribeirodantas left16:37
← adamretter left16:37
→ kopparam joined16:39
← lb1a left16:39
← tristanp left16:40
→ mustmodify joined16:40
← cbr_ left16:41
← solker left16:42
→ lolmaus joined16:42
← jagob left16:43
← adamben left16:43
← sebhoss left16:43
lolmaus "foo" does not appear in any source code file of my project, but i suspect it was there previously. How do i search past commits for an occurence of "foo"?16:43
← CustosL1men left16:43
kadoban lolmaus: 'git log -Sfoo' maybe?16:44
→ MarkyC joined16:44
← kopparam left16:44
→ lindenle joined16:45
← mustmodify left16:45
← nour left16:45
lolmaus kadoban: does this search codebase or commit messages?16:45
→ adamben joined16:45
kadoban lolmaus: Code16:46
→ likewhoa joined16:46
lolmaus kadoban: thx16:46
kadoban 'welcome16:46
→ kopparam joined16:47
← Milkweed left16:48
← thedudez0r left16:48
→ thedudez0r joined16:49
→ checkit joined16:51
→ Techno786 joined16:51
→ richardlitt joined16:52
→ sword joined16:52
← zumba_addict left16:52
richardlitt What should I add as a remote to get the latest version of git for dev?16:52
→ zumba_addict joined16:53
osse richardlitt: do you have a repo to begin with?16:53
← Technocrat left16:53
richardlitt Yeah, got it off of GitHub. Can’t seem to find anywhere where the repo is actually stored16:53
← Macaveli left16:53
richardlitt Been searching for around thirty minutes. :|16:53
osse richardlitt: the github mirror is up-to-date16:53
→ Technocrat joined16:54
← ehmatthes left16:54
← adamben left16:54
richardlitt Cool.16:54
Solid1_afk → Solid116:55
richardlitt Do you have any suggestions for a guide to how to use the ‘submit a patch to git’ guide?16:55
I’m completely unfamiliar with using an email client to submit a patch16:55
← Olipro left16:55
osse richardlitt: you can use git-send-email16:55
bremner man git format-patch16:55
gitinfo the git-format-patch manpage is available at http://jk.gs/git-format-patch.html16:55
osse that's what I use16:55
bremner or that.16:55
→ dorkmafia joined16:55
→ jagob joined16:55
→ EminenceHC joined16:56
bremner git-send-email assumes output mail works from your workstation.16:56
← gain left16:56
← Akagi201 left16:56
richardlitt I don’t have email set up from my Terminal; would I need to do that?16:56
I’ve traditionally only used gmail16:56
← flowinho left16:57
richardlitt Not opposed to learning more, just kind of a very difficult process getting up to scratch16:57
osse richardlitt: git-send-email supports gmail16:57
that's what I use ^_^16:57
← Techno786 left16:57
richardlitt Cool.16:57
← kriks left16:57
→ flowinho joined16:57
richardlitt So, this says one commit per file, and one file per patch16:57
so any fixes for a few files needs a few emails?16:57
osse where does it say that?16:58
bremner one commit per file? that sounds wrong.16:58
richardlitt Do I need to sign up to the mailing list to submit a patch? I did before, but I was overwhelmed with the amount of emails16:58
“Prepare each commit with its patch in one file per commit"16:58
osse you don't have to sign up16:58
→ ascarter joined16:58
osse richardlitt: the patch is in one file. the patch can modify several files16:58
→ moritzschaefer joined16:58
→ saurabh joined16:58
→ tristanp joined16:58
richardlitt Hmm. Ok.16:59
osse it does not mean that a commit can only touch one file at a time16:59
kadoban richardlitt: It means one commit should be one patch file, not one commit should modify one file.16:59
saurabh → Guest7122416:59
richardlitt Alright; is there a good man page for what a patch is, then?16:59
I learned on GitHub, used to PRs and not patches16:59
← SadiQ_ left16:59
→ martinklepsch joined16:59
richardlitt (Sorry)16:59
← jnavila_ left16:59
osse richardlitt: a patch is what git diff produces (for example)16:59
kadoban richardlitt: A patch is essentially the output of 'diff', 'man patch' will explain it in general terms16:59
bremner richardlitt: try git log --patch on your PR17:00
that will give you some idea.17:00
← gavit left17:00
→ jiskiras joined17:00
← dorkmafia left17:00
← EminenceHC left17:00
richardlitt Cool. So, a good workflow for a doc fix is to branch off of the newest commit from maint branch, do my commits, create a diff patch file, and then git-send-email17:00
← geekbri left17:00
→ solker joined17:01
← aswen left17:01
osse yes17:01
bremner git send-email can make the patch at the same time.17:01
s/patch/patch series/17:02
→ ryug joined17:02
← davidreis_ left17:02
→ Neozonz joined17:02
← Neozonz left17:02
→ Neozonz joined17:02
richardlitt Cool. So: pull, branch, edit, commit, then git send-email17:02
bremner yep17:02
→ mustmodify joined17:02
bremner branching is somewhat optional, if you're careful about pushing.17:02
mustmodify I would like to find out if-and-when a certain string existed in a config file. Is there a git function for that?17:03
→ mennea joined17:03
→ Sasazuka joined17:03
kadoban mustmodify: pickaxe is a decent way. 'git log -Sthestring -- the_file'17:03
← leakybuckit left17:04
bremner mustmodify: the config file is tracked in git? as opposed to a git config file?17:04
kadoban Also, tracking config files is usually not a good idea.17:04
!config17:04
gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas17:04
← dangerousdave left17:04
→ dangerousdave joined17:05
→ akushner_ joined17:05
mustmodify bremner: It's an application-settings kind of file. customer service email addresses, thresholds, etc.17:05
← teran left17:05
Bilge Is it possible clone without history, or to wipe the commit history after cloning?17:05
bremner then yeah, kadoban's answer should work17:05
mustmodify kadoban: Can you explain to me why that kind of file should not be in git?17:06
← m0viefreak left17:07
→ winst joined17:07
← WORMSS left17:07
← TomyWork left17:08
kadoban mustmodify: It depends what the config is. In general, config files behave poorly in git though. There's often secret data in them, so once you share your history you've opened yourself up to security nightmares. Also, if you have other developers working with you, they may want different config than you, there's no good way to do that with a tracked config file.17:08
← a_le left17:08
kadoban mustmodify: The link above details some ways to avoid the trouble. Of course this doesn't apply to every configuration file, but...most of them for sure.17:08
→ Quevin joined17:09
← martinklepsch left17:10
ryug → gutoyr17:11
← derringur left17:11
← zumba_addict left17:11
→ Rixius joined17:11
→ quetz joined17:12
→ zumba_addict joined17:12
mustmodify kadoban: Ah, yes. Storing secrets in git is problematic.17:13
→ blackmesa joined17:13
← iamjarvo left17:14
kadoban mustmodify: Very common too. People forget they did so (or they delete the file going forward, but leave it in history), and then upload to github...fun.17:14
→ ThePeach joined17:15
ThePeach hi all I'm looking for a tool for displaying statistics for git repos, specifically commit history analytics per author across several git repos. Does anybody know anything that can do this?17:16
→ martinklepsch joined17:16
← metateck left17:17
← Novitsh_ left17:17
→ Syko joined17:17
← kopparam left17:17
Syko If I clone a repository, and the repository's file called genna.txt gets a update, how can I get git to only update that file rather than downloading the whole repository all over again?17:18
→ a_le joined17:19
ThePeach Syko: it won't: the protocol will fetch only the diff of the changed file(s) (more or less)17:19
→ otter768 joined17:20
→ Derega joined17:20
mustmodify kadoban: Thanks for the tip.17:20
← shigoseii left17:21
Syko If I do "git clone https://github.com/test/Test.git" - and after some weeks, Test has received some updates in files. How can I get git to fetch only the changed files and replace them?17:21
kadoban Syko: That's not directly how git works, something like 'git fetch' or 'git pull' is probably what you're looking for though.17:21
→ doev joined17:22
Syko kadoban; so if I want git to update the files that have received edits rather than downloading the whole thing again, what command should I make use of?17:22
→ LeMike joined17:22
← mustmodify left17:22
qsuscs Syko: man git pull17:22
gitinfo Syko: the git-pull manpage is available at http://jk.gs/git-pull.html17:22
← Bryzzle left17:23
Syko qsuscs; reading manuals is not my style. just give me the command17:23
kadoban Syko: I'm really not interested in giving you a specific command that you won't understand once it goes wrong. If you're going to use git, you really need to learn at least the bare minimum.17:23
→ Bryzzle joined17:23
→ jorj joined17:23
kadoban Syko: Also, haha...not a good way to get help on IRC. Good luck in the future.17:24
qsuscs …17:24
what kadoban says.17:24
← thiago left17:24
← otter768 left17:24
← gfixler left17:24
→ antran joined17:24
→ solrize joined17:24
← skylite left17:24
Syko kadoban, am I arrogant and witty?17:25
→ in_deep_thought joined17:25
solrize you all seen that rcs wrapper that eric s. raymond is peddling, that tracks individual files separately instead of whole trees? would it be terribly hard to add that to git? "git init --decoupled" or something like that.17:25
kadoban solrize: Sounds like CVS reinvented?17:25
← Syko left17:25
kadoban Or RCS maybe I meant.17:25
→ decompiled joined17:26
solrize rcs, yes, it's literally an rcs wrapper17:26
← decompiled left17:26
kadoban Crazy. Everything old is new again.17:26
← Derega left17:26
qsuscs for some edge cases, the CVS model (“tree? what’s that? oh, that stuff we store our versioned files in?”) has its advantages17:27
crystal77 How come when I run "git pull origin master" it prompts me to merge? Is that because I made a change to a file, and that same file was changed too? Cause sometimes it happens, sometimes it doesn't...17:27
qsuscs crystal77: !pull17:27
gitinfo crystal77: 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/17:27
→ Macaveli joined17:27
→ atran joined17:28
← tummy left17:28
kadoban crystal77: pull implies a merge. Sometimes it can automatically merge, sometimes there are conflicts (it can't tell how to merge without your help), and then you have to tell it what to do.17:28
← achadwick left17:28
→ marthinal_ joined17:28
solrize kadoban it's useful, i've kept wanting something like it, like when i have a bunch of text files in a directory17:29
i.e. a poor man's wiki17:29
← winst left17:29
← marthinal left17:29
kadoban solrize: Ah, like when they're not really tightly coupled, just happen to be stored together or something?17:30
crystal77 Well, it didn't prompt me to do anything, just to commit their pre-written message. I'm assuming it was able to merge successfully, and needed me to commit a 2nd time?17:30
solrize yes17:30
kadoban Interesting.17:30
qsuscs didn’t someone program a DCVS?17:30
← sword left17:30
← Evie_Hammond left17:30
→ Derega joined17:30
← mikecmpbll left17:30
milki now why would someone ever do that17:30
← Guest71224 left17:31
solrize qsuscs, esr's thing isn't distributed iirc17:31
kadoban crystal77: I'm not sure exactly what you mean, that doesn't sound like a normal result of pull. Make sure you read what's happening in detail and be careful.17:31
← marthinal_ left17:31
crystal77 Hmm, alright...17:31
← martinklepsch left17:32
← tvw left17:32
← mennea left17:32
→ mennea joined17:33
← m4tthumphrey left17:33
← dangerousdave left17:34
← The_Phoenix left17:34
← jonatasnona left17:35
ThePeach hey17:35
whoops17:35
→ The_Phoenix joined17:35
← liamkeily left17:35
→ Shusshu joined17:35
→ gavit joined17:36
← phix left17:37
← mihaicris left17:38
← wrouesnel left17:38
← errr left17:38
→ mihaicris joined17:38
← wrouesnel2 left17:38
← jcalonso left17:39
→ Stevie-O joined17:39
→ marthinal joined17:39
← CussBot left17:40
→ CussBot joined17:40
← arnatal left17:40
← mihaicris left17:40
→ mihaicris joined17:41
← vurma left17:42
→ decompiled joined17:42
Stevie-O I've got msysgit 1.9.4 and I'm trying to do a rebase and running into an odd problem17:42
I have a commit for change A, followed by a commit for change B, followed by a commit to add a file that was supposed to be part of A and somehow missed, followed by a bunch of other commits17:43
← Shusshu left17:43
← francisfish left17:43
← marchdown left17:43
← ecky--ptang-zoob left17:43
Stevie-O My intention is to use rebase to reorder it so that instead of A-B-A'-... it's A-A'-B-... and then I intend to squash A and A' together17:44
→ ecky--ptang-zoob joined17:44
← ThePeach left17:44
→ tyreld joined17:44
← fstd left17:45
Stevie-O but when I try the rebase I get: "error: Your local changes to the following files would be overwritten by merge:" and then it mentions the file that was added in A'17:45
→ ThePeach joined17:45
ThePeach does anybody know a tool for analysing a git repo commit history? even better if it can work for multiple repos17:45
Stevie-O analyze how?17:45
→ quetz^^ joined17:45
← jheg left17:45
canton7 Stevie-O, 'git status'?17:45
osse Stevie-O: sounds like you have uncommited changes at the time yournu rebase17:45
canton7 Stevie-O, I'm guessing you've got uncommitted changes when you're trying to start the rebase?17:45
→ francisfish joined17:45
Stevie-O I dont' believe I do17:45
ThePeach Stevie-O: as in statistics17:45
Stevie-O I've done a 'git reset --hard'17:46
canton7 Stevie-O, 'git status', please17:46
ThePeach how many commits per day per author... basic stuff I think17:46
Stevie-O specifically, the branch I'm trying to refactor is 'refactoring' so I did 'git reset --hard refactoring && git checkout refactoring'17:46
canton7 whaa17:46
Stevie-O err s/to refactor/to rebase/17:46
canton7 so you reset your current branch to 'refactoring', then checked out refactoring17:46
that doesn't sound right...17:47
→ mikecmpbll joined17:47
← Technocrat left17:47
← Prawnzy left17:47
Stevie-O well, that makes sense, cuz obviously I'm doing something wrong :)17:47
okay hold on17:47
canton7 anyways, I'm off home. someone else will help you out. good luck!17:47
!lol please17:47
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all17:47
← melter_ left17:47
Stevie-O git diff says nothing but git status says I'm currently editing a comit while rebasing a branch17:47
← francisfish left17:47
→ francisfish joined17:47
← quetz left17:48
Stevie-O how do I kick git in the head hard enough to dislodge any notion of in-progress weirdness17:48
osse so there's an existing rebase in progress17:48
← Bryzzle left17:48
osse git rebase --abort17:48
← melter left17:48
← Xethron left17:48
Stevie-O ah. that wasn't one of the options it offered me, heh17:48
okay17:48
so now git status says: On branch refactoring / nothing to commit, working directory clean17:48
is that right?17:48
→ nnyk_ joined17:49
Stevie-O err, is that what I want it to say17:49
← Dewi left17:49
Stevie-O tries 'git rebase -i master' again17:49
Stevie-O and it still goes awry17:50
← rpg left17:50
Solid1 → Solid1_afk17:50
Stevie-O You are currently editing a commit while rebasing branch 'refactoring' on 'bedf5ed'. modified: <file added in commit A'>17:50
→ Xethron joined17:50
osse did you mark a commit for editing?17:50
Stevie-O No? I simply reordered the lines17:51
→ martinklepsch joined17:51
→ fstd joined17:51
osse !repro17:51
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.17:51
Stevie-O is there a way to add a 'breakpoint'? To insert a new commit in the middle?17:51
→ sdegutis joined17:52
milki yes17:52
← francisfish left17:52
milki hence the interactivity in the rebase command17:52
sdegutis I have a commit where I basically just removed one line at the beginning of every function in a file, and de-indented them. But git-diff (with no options) is showing me a really confusing diff, trying to get clever about what was removed. Is there a way to make git-diff show me it the way I just described it?17:53
← jb55 left17:53
← nnyk_ left17:53
→ Dewi joined17:53
← h4ml3t left17:54
→ srcerer joined17:54
→ jb55 joined17:54
milki sdegutis: try man git diff -w17:54
gitinfo sdegutis: the git-diff manpage is available at http://jk.gs/git-diff.html17:54
→ phix joined17:54
← zumba_addict left17:55
← palcu left17:55
milki if its empty, at least you know its all whitespace17:55
← tharkun left17:55
→ tharkun joined17:55
→ wrouesnel2 joined17:55
sdegutis Hmm, I noticed that I type 'man git-diff' rather than 'git help diff' which I guess is a notch in my neckbeard.17:55
gitinfo the git-diff manpage is available at http://jk.gs/git-diff.html17:55
→ zumba_addict joined17:55
milki not what you want though -.-17:55
→ wrouesnel3 joined17:55
Stevie-O okay, so if I do 'git rebase -i', and change one of the lines from 'pick' to 'edit', it will stop just before the commit phase?17:55
milki Stevie-O: !tias17:56
gitinfo Stevie-O: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.17:56
sdegutis milki: Oh wow, I didn't even think that maybe it had an option to ignore whitespace!!!17:56
→ oldtopman joined17:56
sdegutis This works great!17:56
Stevie-O okay, I think I may see the problem17:56
j416 how do I kill a git bisect run?17:56
guess I could just kill it17:57
I wonder if there is a proper way17:57
← richardlitt left17:57
← jb55 left17:58
→ bhuvanaurora joined17:58
Stevie-O okay interesting17:58
← fahadash left17:59
← The_Phoenix left17:59
→ EminenceHC joined18:00
← subhojit777 left18:00
→ sohail joined18:00
→ SadiQ_ joined18:00
← SadiQ_ left18:00
← bhuvanaurora left18:00
→ githogori joined18:00
→ bhuvanaurora joined18:01
→ kukks joined18:01
← kukks left18:01
→ kukks joined18:01
← ThePeach left18:01
← fstd left18:01
→ SadiQ__ joined18:01
← SadiQ__ left18:01
→ iamjarvo joined18:01
← freimatz left18:01
← bhuvanaurora left18:02
→ ajustrun joined18:02
← mennea left18:02
→ mennea joined18:03
← hahuang61 left18:03
→ The_Phoenix joined18:03
→ fr33domlover joined18:04
← Macaveli left18:04
sdegutis git diff -w --color-words HEAD^ # this is amazing!18:04
→ pantsman- joined18:04
← wrouesnel2 left18:04
← FreezingCold left18:04
← The_Phoenix left18:04
→ winst joined18:04
osse Stevie-O: what is?18:05
→ virtualsue joined18:05
← EminenceHC left18:05
← ruukasu left18:05
Stevie-O I'm writing up my observations18:05
→ ruukasu joined18:05
sdegutis Can I make `-w --color-words` the default when diffing .clj files?18:05
→ tvw joined18:05
← githogori left18:05
← wrouesnel3 left18:06
← phix left18:06
→ chiromante joined18:06
→ Patch joined18:06
osse sdegutis: yes, using gitattributes you can define an external diff driver18:06
→ melter joined18:06
osse and that diff driver can be git diff itself18:07
→ githogori joined18:07
→ melter_ joined18:07
sdegutis osse: <318:07
→ dorkmafia joined18:07
← ErKa left18:07
→ thiago joined18:08
← atran left18:08
← mikecmpbll left18:09
← Dewi left18:09
→ Zvpun joined18:10
→ wrouesnel joined18:10
← twoface88 left18:10
→ Nijikokun joined18:10
→ mikecmpbll joined18:10
→ tirengarfio joined18:10
→ wrouesnel1 joined18:10
sdegutis Git is so cool. I was able to see how I used a function just before my last commit by doing: git grep -C2 with-eula-sig HEAD^18:11
→ Dewi joined18:11
→ hexagoxel joined18:12
→ gain joined18:12
← antran left18:12
Zvpun Hi, when I "git checkout other-branch -- :/file" this file is already staged, but I only want to change the workdir, therefore I then "git reset -- :/file". a) What is the reason behind "git checkout branch -- file" also staging? (From the documentation I got the impression that checkout "works" on the workdir and "git reset" on HEAD and the index). b) Is there another/simpler way of getting the content of a fi18:12
le on another branch into the working directory only, (i.e. am I doing it wrong)?18:12
→ The_Phoenix joined18:12
→ mgaunard_ joined18:13
→ phix joined18:13
mgaunard_ I'd like to cherry pick a lot of commits from the master branch to the release branch of my project18:13
is there a convenient way to do this?18:13
I don't want to manually type lots of SHA-1, i'd rather just select the ones I want or not18:14
kadoban mgaunard_: rebase -i seems like it'd work fine18:14
mgaunard_ how would I use it in this scenario?18:14
Stevie-O https://gist.github.com/Stevie-O/e9d78c27c46974a2d34218:14
osse: the short version is, it's like rebase isn't updating the index after one of the commits, so the changes from that commit stay "in the way" and screw things up on a later commit18:16
→ jonnyro joined18:16
← decompiled left18:16
← wrouesnel left18:16
← goTAN left18:17
kadoban mgaunard_: Something like.... 'git checkout master && git checkout -b temp_branch && git rebase -i --onto release master~100' then you do the interactive rebase, and then you can merge (which will ff-merge) the temp branch into release.18:17
← wrouesnel1 left18:17
← phix left18:18
kadoban mgaunard_: master~100 is arbitrary, just make it 1 commit before the first one you want to cherry-pick18:18
mgaunard_ "git rebase -i release master" actually seems to do what I want18:18
kadoban Possibly.18:18
mgaunard_ hmm, no it doesn't18:19
it doesn't do it on my current branch18:19
→ heath joined18:20
heath this is a little embarrassing18:20
gpo fix/useful-errors-for-bitrpc18:20
gpo is an alias for git push origin18:20
error: failed to push some refs to 'git@github.com:heath/bitcoin.git'18:20
hint: Updates were rejected because the tip of your current branch is behind18:20
hint: its remote counterpart. Integrate the remote changes (e.g.18:20
← ecky--ptang-zoob left18:20
← sdegutis left18:21
→ Technocrat joined18:21
← mikecmpbll left18:21
heath git pull --rebase bitcoin master18:21
← pandeiro left18:21
heath actually18:22
→ mikecmpbll joined18:22
heath i did18:22
git checkout master18:22
git pull --rebase bitcoin master18:22
→ liamkeily joined18:22
← devoldmx left18:22
heath gpo master18:22
git checkout fix/useful-errors-for-bitrpc18:22
← lolmaus left18:22
heath git merge origin/master18:22
→ TomyLobo joined18:22
→ WaReZ joined18:23
heath git add . ; git commit -m 'useful message'; gpo fix/useful-errors-for-bitrpc and i still get the same error messages18:23
← rnsanchez left18:23
← kerrick left18:23
heath ...about the tip my current branch being behind the remote counterpart18:23
→ wrouesnel2 joined18:23
← mennea left18:24
→ wrouesnel3 joined18:24
→ phix joined18:24
heath that's what i'm working on for a little bit longer, if anyone has some feedback, that'd be cool18:24
← msankhala left18:24
← Xethron left18:24
heath but it's probably good that i figure this out :)18:24
← flowinho left18:24
→ sMa_ joined18:24
← martinklepsch left18:24
→ mennea joined18:24
← ferri left18:25
→ hgl joined18:25
← [H]unt3r left18:26
→ leeN joined18:26
→ Bryzzle joined18:27
→ marchdown joined18:27
→ ferri joined18:28
← astrofog left18:28
→ dangerousdave joined18:28
→ msankhala joined18:28
← St_Marx left18:28
← dangerousdave left18:29
← ManikM left18:29
→ ManikM joined18:29
→ teran joined18:29
← hgl left18:30
← its-martin left18:30
← sohail left18:30
← ferri left18:30
→ donmichelangelo joined18:30
← marcogmonteiro left18:31
→ devoldmx joined18:31
← The_Phoenix left18:31
← Rixius left18:31
→ baweaver joined18:32
→ chrisgeorge_ joined18:33
→ FreezingCold joined18:33
← michelangelo left18:33
← gain left18:34
← hexagoxel left18:35
→ bshacklett joined18:35
← chrisgeo left18:35
← NoNMaDDeN left18:36
→ hahuang61 joined18:36
→ The_Phoenix joined18:36
→ [H]unt3r joined18:37
bshacklett Does anyone have a recommendation for a toolset for using Git Flow from Powershell on Windows?18:37
← chrisgeorge_ left18:37
← msankhala left18:37
→ m8 joined18:38
→ chrisgeo joined18:38
→ pandeiro joined18:38
→ beneggett joined18:38
→ rnsanchez joined18:38
→ jb55 joined18:40
← kadoban left18:41
→ Sijdesign joined18:42
← enitiz left18:42
← kukks left18:42
→ metateck joined18:43
← mikecmpbll left18:43
← tvw left18:44
← marchdown left18:44
→ mikecmpbll joined18:44
→ Zvpun_ joined18:45
→ bhuvanaurora joined18:48
← ascarter left18:48
← zumba_addict left18:48
← Zvpun left18:48
← GGflags_ left18:48
→ zumba_addict joined18:49
→ MarkyC_ joined18:50
← Dreamer3 left18:50
← The_Phoenix left18:50
heath ignore, i took the terrible route18:51
← MarkyC left18:51
MarkyC_ → MarkyC18:51
→ The_Phoenix joined18:52
→ kriks joined18:53
→ nettoweb joined18:53
→ thekkid joined18:53
→ joelm joined18:54
thekkid I'm doing something wrong with my workflow. When I do a interactive rebase to squassh commits I get a bunch of merge conflicts. Should I just not be merging at all in my feature branches before I do the squashes/18:54
Solid1_afk → Solid118:54
Mixologic Is there a command line, 'one time' version of .gitignore? I've got a tree that has hundreds of changed files, but *most* of the changes are a minor tweak to a specific file type, but there are a few small changes Id like to see in a git status..18:56
← gavit left18:56
Mixologic I could add the file to gitignore, then remove it from gitignore, but that seems hassle-y18:56
→ ecky--ptang-zoob joined18:56
osse Mixologic: git update-index --assume-unchanged18:57
→ stamina joined18:57
→ corni joined18:57
← corni left18:57
→ corni joined18:57
← jagob left18:57
→ StarManta joined18:58
→ carlosr joined18:59
→ jagob joined18:59
→ palcu joined19:00
→ kpease_ joined19:01
← Technocrat left19:02
→ richardlitt joined19:03
← kpease left19:03
Solid1 → Solid1_afk19:04
← Sijdesign left19:04
kpease_ → kpease19:04
kpease → kpease_19:04
Mixologic osse: thanks. find . -name '*.{filetype}' -exec git update-index --assume-unchanged '{}' \; works!19:05
→ EminenceHC joined19:05
→ marchdown joined19:05
osse Mixologic: remember to --no-assume-unchanged afterwards19:05
← bhuvanaurora left19:06
← dsantiago left19:06
→ dtrott joined19:07
← marchdown left19:07
→ dsantiago joined19:07
→ hexagoxel joined19:08
← EminenceHC left19:09
→ veebers joined19:10
← The_Phoenix left19:11
→ alanwill joined19:12
← solker left19:12
← buffal0 left19:12
→ devoldmx33 joined19:12
→ durre joined19:12
→ fstd joined19:12
→ The_Phoenix joined19:13
→ buffal0 joined19:13
← dsantiago left19:13
← iamjarvo left19:13
→ dsantiago joined19:14
← devoldmx left19:15
→ devoldmx joined19:15
→ Ionic joined19:16
Ionic stupid question: how do I resolve merge-conflicts in a feature branch so that no conflicts happens anymore when merging the feature branch into the main branch?19:17
← The_Phoenix left19:17
→ fahadash joined19:17
← baweaver left19:17
← devoldmx left19:17
→ nnyk_ joined19:18
→ devoldmx joined19:18
← akushner_ left19:18
→ Technocrat joined19:18
→ Rixius joined19:19
→ unixpro1970 joined19:19
← jb55 left19:19
→ knobo joined19:19
← noway__ left19:20
→ jb55 joined19:20
Ionic hmm...19:20
→ otter768 joined19:20
Ionic rebasing the feature-branch against the main branch does the trick19:20
← liamkeily left19:20
→ Milkweed joined19:21
← devoldmx left19:21
→ devoldmx joined19:21
Ionic but that's a non-fast-forward19:22
→ NoNMaDDeN joined19:22
← teran left19:23
→ akiva joined19:23
→ tummy joined19:23
← mennea left19:23
← mgaunard_ left19:24
← kriks left19:24
← israelpattison left19:24
← otter768 left19:25
→ israelpattison joined19:25
← mihaicris left19:25
→ paul424 joined19:25
→ Cassiopaya joined19:25
→ IlNominePatre joined19:25
→ mennea joined19:26
→ jheg joined19:26
← unixpro1970 left19:26
← stamina left19:27
← richardlitt left19:27
→ martinklepsch joined19:28
← basiclaser_ left19:31
← jiskiras left19:32
→ ascarter joined19:32
→ punchaga` joined19:32
→ sq1 joined19:32
← punchaga` left19:33
→ DolpheenDream joined19:34
← punchagan left19:35
← diegoaguilar left19:36
← mellernoia left19:36
← axl_ left19:36
KevinMGranger It will be a fast-forward when you try to do the merge if you rebase it19:36
→ axl_ joined19:37
→ mellernoia joined19:37
← winst left19:38
← sq1 left19:39
← webframp left19:40
← nnyk_ left19:40
→ LucasTT joined19:41
→ liamkeily joined19:41
→ richardlitt joined19:41
← doev left19:42
→ ianbrandt joined19:43
→ snuffeluffegus joined19:44
→ gfixler joined19:45
gfixler something I hadn't noticed before, but checking out a path at a commit checks it out staged19:46
e.g. git checkout <hash> <path>19:46
is there a way to check a file out of another commit without staging it?19:46
I didn't see anything in $ git help checkout19:46
→ diegoviola joined19:46
→ ojacobson joined19:47
← t0th_-___ left19:48
← Technocrat left19:48
Seveas gfixler: use rm --cached after the checkout19:48
→ baweaver joined19:49
gfixler doesn't seem to work19:49
git reset @ <path> works19:50
→ MattMaker joined19:50
gfixler but I was wondering if there was a way with just checkout to do it19:50
→ t0th_-___ joined19:50
KevinMGranger Not with just checkout, nope19:50
you could do git show REVISION:PATH > PATH19:51
gfixler KevinMGranger: that's true - I used to use that method19:51
and still keep trying to git checkout <hash>:<path>, which fails19:51
well, good to know one way or the other - thanks19:52
← jheg left19:52
→ yaymukund joined19:53
← thedudez0r left19:55
Ionic KevinMGranger: yes, but the feature-branch will be non-fast-forward19:55
I guess that's acceptable...19:55
← mennea left19:55
Ionic if non-fost-forward pushes are allowed, that is19:55
← Bryzzle left19:56
→ kukks joined19:56
→ mennea joined19:56
→ Bryzzle joined19:57
← angelsl left19:58
richardlitt So.. anyone know what flags are usually used for git send-email to submit to git?19:58
I’m emailing from a Gmail account, I suppose.19:59
qsuscs richardlitt: man git send-email, grep for gmail20:00
gitinfo richardlitt: the git-send-email manpage is available at http://jk.gs/git-send-email.html20:00
Ionic nope, non-fast-forward pushes are not allowed, meh20:00
→ Macaveli joined20:01
→ sinequanon joined20:02
← devoldmx left20:02
richardlitt Do you know if I should change `git format-patch --cover-letter -M origin/master -o outgoing/` to the branch I am using?20:02
→ EvilPenguin joined20:02
← [H]unt3r left20:02
richardlitt instead of origin/master20:02
→ [H]unt3r joined20:02
← axl_ left20:03
← richardlitt left20:04
→ thedudez0r joined20:04
→ Technocrat joined20:04
→ richardlitt joined20:04
← rnsanchez left20:04
Ionic so I'm merging the main branch into the feature branch and merging the feature branch into the main branch should work without any conflicts (in theory)20:05
→ axl_ joined20:05
← in_deep_thought left20:05
Ionic also, this will be fast-forward on the feature branch and pushable20:05
→ Gizburdt joined20:06
← Macaveli left20:06
Ionic yeah, seems to be working just fine20:06
← aartist left20:06
→ settermjd joined20:06
Ionic I just have a merge commit in my feature branch, but that's ok20:06
← whomp left20:07
_ikke_ Did you read the documentation about submitting patches through gmail?20:07
← zumba_addict left20:08
← Bryzzle left20:08
Ionic uhm... or not. some hook is rejecting merge commits, what20:08
← jonnyro left20:08
→ cagedwisdom joined20:08
→ zumba_addict joined20:09
← ruukasu left20:09
← Rixius left20:09
← richardlitt left20:09
← kpease_ left20:09
→ aard_ joined20:09
→ EminenceHC joined20:09
→ kpease joined20:10
→ jheg joined20:10
→ Bryzzle joined20:10
← thedudez0r left20:11
← t0th_-___ left20:11
→ HelloShitty joined20:13
← Zupoman left20:13
→ Zupoman joined20:13
← Zupoman left20:13
→ Zupoman joined20:13
← EminenceHC left20:14
→ hgl joined20:15
← tristanp left20:15
→ tristanp joined20:15
→ thedodd joined20:16
→ richardlitt joined20:16
← jb55 left20:17
→ tranzfus_ joined20:17
→ kadoban joined20:17
→ jb55 joined20:17
← tranzfus_ left20:17
← nrsk left20:17
← kpease left20:18
→ tranzfus_ joined20:18
→ pheaver joined20:18
← Rampages left20:18
← hgl left20:19
← beneggett left20:19
→ kpease joined20:19
→ beneggett joined20:19
→ jb55_ joined20:19
→ Rampages joined20:19
← jb55 left20:20
→ sooheon joined20:20
← sooheon left20:20
→ sooheon joined20:20
← Bryzzle left20:20
← tranzfuse left20:21
→ arnaud___ joined20:21
← arnaud___ left20:21
→ arnaud___ joined20:21
← fahadash left20:21
← FreezingCold left20:22
← aard_ left20:22
← Marcus___ left20:22
→ t0th_-___ joined20:23
← sooheon left20:24
→ sooheon joined20:24
← mennea left20:25
→ mennea joined20:26
← ascarter left20:27
← jb55_ left20:27
→ ascarter joined20:27
← tummy left20:27
→ jb55 joined20:27
→ mgaunard_ joined20:28
← Rampages left20:29
← ManikM left20:29
→ Rampages joined20:29
→ ManikM joined20:29
→ ra0 joined20:30
← mellernoia left20:30
← Gizburdt left20:31
← sooheon left20:31
→ sooheon joined20:31
→ Gizburdt joined20:31
→ jonatasnona joined20:32
→ skylite joined20:33
← sooheon left20:34
← knobo left20:35
→ devoldmx joined20:35
→ tier joined20:35
← Gizburdt left20:35
→ alekks joined20:36
→ Dquernoti joined20:36
← tier_ left20:37
← githogori left20:38
→ githogori joined20:39
← kukks left20:39
→ teran joined20:40
→ in_deep_thought joined20:41
← dougsland left20:42
← chrisgeo left20:42
← gfixler left20:43
← txomon|home left20:43
← alekks left20:45
→ alekks joined20:46
→ thedudez0r joined20:46
→ txomon|home joined20:46
← baweaver left20:46
← cebor left20:46
→ baweaver joined20:47
← baweaver left20:47
gitinfo set mode: +v20:47
← ecky--ptang-zoob left20:47
→ cebor joined20:47
← mennea left20:48
thedudez0r ok, I was editing a couple files and I hadn't done a commit in this repo in a long time20:48
← EvilPenguin left20:49
← zumba_addict left20:50
→ h4ml3t joined20:50
→ EvilPenguin joined20:50
→ zumba_addict joined20:50
thedudez0r I rebooted and all of the sudden, my .config/tilda/config_0 file was modified to a default one (I think the package got upgraded, not sure), thing is if I did git diff, I could see my previous file being in the local index20:50
← Cassiopaya left20:51
← IlNominePatre left20:51
thedudez0r so I did a git checkout of the file and I got it back to where I needed it20:51
← Patch left20:51
thedudez0r but since I also saw in the commits differences between a couple other files, I thought the same thing had happened, with the wanted files being in the index and outdated/unwanted versions of them being in my workspace, so I did a git checkout on those too (mistakenly), and then I did a commit20:52
how can I see the changes that were never commited but were in the workspace right before I did the checkout?20:53
uhh this is a difficult situation to explain20:55
→ Bryzzle joined20:55
→ nnyk_ joined20:55
→ FreezingCold joined20:55
_ikke_ git fsck --unreachable should show you hashes of the blobs of the files20:55
→ mennea joined20:56
thedudez0r basicly, I think I made a bunch of changes to some files, and then BY MISTAKE checkout'd them (meaning the new versions got overwritten by the ones in index which were the original) and made a commit from that (which was not what I wanted)20:56
_ikke_ thedudez0r: Was the state of the files you want ever git added?20:57
(in the index)20:57
thedudez0r _ikke_: no20:57
← HelloShitty left20:57
thedudez0r the files were already being tracked yes20:57
_ikke_ git checkout in this way is ruthless20:57
→ Rixius joined20:58
thedudez0r so I lost these changes forever?20:58
_ikke_ Unless you have them in an editor buffer or something20:58
yes20:58
thedudez0r git fsck --unreachable shows nothing20:58
→ sooheon joined20:59
→ tpollard joined20:59
← alekks left20:59
→ baweaver joined21:00
→ alekks joined21:00
thedudez0r so what this mistake is basicly telling me is to git the fuck add out of every change I make before starting to wildly make checkouts21:00
_ikke_ yeah, commit early, commit often21:00
thedudez0r i hate git21:01
will uninstall21:01
jk but fuck git... i'ma git outta here i'm pissed21:01
_ikke_ thedudez0r: uninstall rm too :P21:01
→ listochkin joined21:02
→ kpease_ joined21:02
→ marchdown joined21:03
← IrishPrime left21:03
→ whomp joined21:03
→ mihaicris joined21:04
← sooheon left21:04
← acharlieh left21:04
_ikke_ but git is a powerful tool, handle with care21:04
→ eli joined21:05
← mihaicris left21:05
← ascarter left21:05
← DonRichie left21:05
← kpease left21:05
osse git is a tool of power, care handle21:05
→ kballou joined21:06
← v0n left21:06
→ v0n joined21:06
karstensrage i have a situation where i have some modifications that i have on a branch but cant deploy them21:08
and i need to make some more changes that should be on a different branch21:08
so is there some flow other than just remembering the branches that eventually need to be merged?21:08
← tirengarfio left21:08
← LeMike left21:08
← bgerber left21:08
← whomp left21:08
← D-Boy left21:08
osse what do you mean?21:10
git doesn't know what you want to merge21:10
→ bgerber joined21:10
→ sword joined21:10
← quetz^^ left21:11
→ EminenceHC joined21:11
→ MadLamb joined21:11
→ aswen joined21:11
← m8 left21:11
← govg left21:11
→ sq-one joined21:12
_ikke_ I guess more for himself21:12
karstensrage well i mean are there any other clever things you git guys do to manage branches that need to be merged at a later time, but go on with other branches?21:12
MadLamb i have a post-receive hook and the permission of the files in the deploy folder is different from the files in my dev folder. what might be happening?21:12
_ikke_ karstensrage: You need a good !workflow21:12
gitinfo karstensrage: Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.21:12
karstensrage im not thinking git actually has anything to make this easier, more the collective wisdom of you guys21:12
richardlitt well, that’s sent off then. sending a patch takes a lot of work if you’re not familiar with it.21:12
thanks osse for the help21:12
also qsuscs21:13
MadLamb the permission in my dev env folder is 644, but in the git deploy folder is 664.21:13
← marthinal left21:14
_ikke_ Something like umask?21:14
osse karstensrage: if you need to leave some uncommitted work behind temporarily you can stash it with git stash. afterwards if you list the stash(es) you have Git will tell you on which branch you made them21:14
← Malsasa left21:14
karstensrage osse, hmmm well the stuff is committed to the branch21:14
its just not merged to "master" where i normally deploy stuff from21:15
← baweaver left21:15
_ikke_ karstensrage: Use a release branch. There you can merge in stuff, but it won't be deployed just yet21:15
osse richardlitt: why does your patch say 71/71 ?21:15
← Bryzzle left21:15
→ baweaver joined21:15
richardlitt To be honest, I’ve got no idea.21:15
← EminenceHC left21:15
richardlitt The output command made 71 different patches21:16
osse ah, well21:16
the mailing list got litt up regardless21:16
← scarcry left21:16
← JEEBcz left21:17
→ JEEBcz joined21:17
richardlitt Clever pun? :P21:17
JEEBcz → JEEB21:17
→ D-Boy joined21:17
richardlitt `git format-patch --cover-letter -M origin/HEAD -o outgoing/` && `git send-email outgoing/0071-Change-usually-to-by-default.patch`21:17
→ pppp2 joined21:18
osse so it produced 0001-0070 also? what was in them?21:18
richardlitt Looks like ever patch since 0000-21:19
I don’t know what these are21:20
they look like emails?21:20
osse richardlitt: just a heads up. I don't know but I suspect you'll be asked to reword the commit message to sounds more generic (ie. avoid first person)21:20
← moritzschaefer left21:20
osse they are21:20
richardlitt Oh, I know.21:20
To be honest, I’ve been meaning to do this for a while, I’m doing this mainly to see how Git does patches21:21
because I’ve only worked with GitHub, which has a totally different model, and I want to know why21:21
→ otter768 joined21:21
← [H]unt3r left21:22
richardlitt I suspect I’ve messed up more than a few times.21:22
:/21:22
← paul424 left21:22
← alexwhitman left21:22
osse richardlitt: old school people stick to old school methods. ie. emails with patches as part of the body21:22
sooo... you've created 71 commits?21:23
richardlitt yep. Maybe I was supposed to include all 71?21:23
1 commit.21:23
osse how many files are in outgoing?21:23
richardlitt 7121:23
:|21:23
osse what are their names?21:23
→ scarcry joined21:24
richardlitt eg, 0042-po-TEAMS-add-new-members-to-German-translation-team.patch21:24
MadLamb ppl i'm deploying a app with a post-receive hook, and its changing the files permission from 644 to 664. Does any1 knows why?21:24
← yaymukund left21:24
osse richardlitt: aaaaaaaaaaaaaaaahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh21:24
richardlitt scream or yell of sudden comprehension>21:24
osse richardlitt: you based your commints on maint, right? origin/HEAD points to master. so the other 70 commits are commits between master and maint21:24
_ikke_ MadLamb: How are you deploying?21:24
richardlitt ah damn.21:24
→ ap0c joined21:24
← ap0c left21:24
→ ap0c joined21:24
MadLamb _ikke_, git push <remote>21:25
_ikke_, bare repo with deploy dir21:25
← pheaver left21:25
osse richardlitt: you should have done git format-patch origin/maint21:25
_ikke_ MadLamb: How did you set up the deploy dir?21:25
richardlitt I did origin/head because I was using a branch off of maint21:25
← mennea left21:25
MadLamb _ikke_, mkdir <dir>, chown user.group <dir>21:26
← otter768 left21:26
→ mennea joined21:26
← pppp2 left21:26
osse richardlitt: then you should have done git format-patch maint21:26
:)21:26
richardlitt :|21:26
So… should I resubmit?21:26
or, something?21:26
← metateck left21:26
_ikke_ richardlitt: First wait for a reaction I guess21:27
MadLamb _ikke_, any idea?21:27
_ikke_ MadLamb: Some umask in efect?21:27
richardlitt _ikke_: yeah, probably. I kind of feel like this will get rejected anyway, it’s a bit overarching.21:27
osse richardlitt: nah. no one'll care about the 71/71 thing.21:27
MadLamb _ikke_, dont know. how can i check that?21:27
richardlitt if people think a couple of seconds before using ‘usually’, I think that’ll be success anyway21:27
osse richardlitt: would have been worse if you sent them all using 'git send-email outgoing' :P21:27
→ bb010g joined21:28
richardlitt I figured that wasn’t what I was supposed to do.21:28
→ chrisgeo joined21:28
_ikke_ right21:28
richardlitt well. Cool.21:28
My work here is done.21:28
qsuscs *mumble git request-pull mumble*21:28
richardlitt qsuscs: ?21:29
Zvpun_ Hi, when I "git checkout other-branch -- :/file" this file is already staged, but I only want to change the workdir, therefore I then "git reset -- :/file". a) What is the reason behind "git checkout branch -- file" also staging? (From the documentation I got the impression that checkout "works" on the workdir and "git reset" on HEAD and the index). b) Is there another/simpler way of getting the content of a f21:29
ile on another branch into the working directory only, (i.e. am I doing it wrong)?21:29
qsuscs oh nvm :)21:29
Zvpun_ → zvpun21:29
richardlitt hahaa, no, I’m curious!21:30
qsuscs man git request-pull21:30
gitinfo the git-request-pull manpage is available at http://jk.gs/git-request-pull.html21:30
← zvpun left21:30
→ zvpun joined21:30
_ikke_ zvpun: git checkout first updates the index, and then the worktree21:30
richardlitt Yeah; should I have used it?21:30
MadLamb _ikke_, https://gist.github.com/fabiocarneiro/db0d535e2cb46571474021:30
qsuscs richardlitt: not for the git list21:30
richardlitt I couldn’t figure out what the actual upstream url is21:30
qsuscs: figured. You don’t like it?21:30
_ikke_ MadLamb: Nothing in there that could cause changing permissions21:30
→ Velzes joined21:31
qsuscs richardlitt: i like it, but i don’t contribute to git21:31
in fact, most of the stuff i do are completely my own things21:31
richardlitt why not?21:31
← Rixius left21:31
MadLamb _ikke_, what else could i see?21:31
_ikke_ MadLamb: When you create new files, what permissions do they have?21:32
→ Rixius joined21:32
← stbaby left21:32
→ adamben joined21:33
→ ascarter joined21:33
← txomon|home left21:33
← settermjd left21:33
→ EminenceHC joined21:33
→ paul424 joined21:33
← EvilPenguin left21:33
→ whomp joined21:34
→ LucasTT_ joined21:34
← webguy left21:34
_ikke_ g2g21:34
MadLamb _ikke_, 644!21:35
_ikke_, i mean 66421:35
→ webguy joined21:35
← Velzes left21:36
← LifeBlood left21:36
→ EvilPenguin joined21:38
← Tuna-Fish left21:38
← LucasTT left21:38
← EminenceHC left21:38
→ LifeBlood joined21:38
→ _2_samie124 joined21:38
← jonatasnona left21:38
← whomp left21:39
→ pheaver joined21:39
← EvilPenguin left21:39
← sMa_ left21:40
→ EvilPenguin joined21:40
→ vurma joined21:41
Eugene 666 is best21:41
→ dregad joined21:42
← EvilPenguin left21:43
→ EvilPenguin joined21:43
← _2_samie124 left21:43
← Ankhers left21:43
← MadLamb left21:44
→ jonatasnona joined21:45
← buffal0 left21:45
← liamkeily left21:45
qsuscs satan, yeah!21:45
← baweaver left21:45
qsuscs my mom’s car’s license plate reads KN-<censored> 666 … i think she doesn’t know what that means :D21:45
→ liamkeily joined21:46
→ dialeth joined21:47
phy1729 Eugene: you are such a Dev21:48
← dsantiago left21:49
← kesroesweyth left21:49
← MarkyC left21:50
→ ruukasu joined21:50
→ dsantiago joined21:51
← EvilPenguin left21:51
→ MadLamb joined21:51
← paul424 left21:52
← Obi_obi left21:52
→ EvilPenguin joined21:52
← dsantiago left21:52
qsuscs hmm so much stuff … time to clean up a bit qsuscs@tatooine ~/c0de % for i in *; do cd $i; [[ -d .git ]] && git gc --aggressive; cd ..; done21:52
← TomyLobo left21:52
→ baweaver joined21:52
→ dsantiago joined21:53
← sinequanon left21:53
→ St_Marx joined21:54
→ joelm_ joined21:54
→ aard_ joined21:55
← mennea left21:55
→ mennea joined21:56
→ ianbrandt_ joined21:56
← mennea left21:57
← ianbrandt_ left21:58
← joelm left21:58
← melter_ left21:58
← pmallya_ left21:59
← ianbrandt left21:59
← Skapadapaduu left21:59
→ mennea joined21:59
← baweaver left21:59
→ ianbrandt joined22:00
← ascarter left22:00
→ baweaver joined22:01
← snuffeluffegus left22:01
→ ascarter joined22:02
→ hgl joined22:03
kpease_ → kpease22:03
kpease → kpease_22:04
← ascarter left22:04
→ paul424 joined22:05
← DolpheenDream left22:05
← EvilPenguin left22:06
→ EvilPenguin joined22:06
→ whomp joined22:06
← kpease_ left22:07
← staafl left22:07
← barduck left22:07
← hgl left22:08
← durre left22:08
→ staafl joined22:08
→ Cheaterman1 joined22:08
← mennea left22:09
← sq-one left22:10
← heath left22:10
← EvilPenguin left22:10
← tristanp left22:10
→ ascarter joined22:11
→ EvilPenguin joined22:11
← EvilPenguin left22:12
→ acharlieh joined22:12
→ EvilPenguin joined22:13
→ Dudi joined22:13
→ txomon|home joined22:13
→ m0viefreak joined22:13
alekks so, how do I know if getting in to git is for me? I allways hear about git - but it feels a bit overkill for my purposes as a small web developer/designer...? Is putting in time understanding git going to save me time/money/headache/whatever...? Or is it mainly larger projects that will pay off?22:14
qsuscs alekks: !parable22:14
gitinfo alekks: 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html22:14
← EvilPenguin left22:14
qsuscs i use git for crap like that. https://git.qsuscs.de/cgit/psychologie.git/22:15
→ EminenceHC joined22:15
→ EvilPenguin joined22:15
alekks qsuscs cheers! i'll read it right away22:15
← SumDude left22:16
← JohnBat26 left22:16
← sburgess left22:17
→ zanchoPa1sa joined22:17
← Rixius left22:18
← aard_ left22:18
→ SumDude joined22:19
← EminenceHC left22:19
→ Rixius joined22:20
← githogori left22:20
← zanchoPansa left22:20
← martinklepsch left22:20
qsuscs ah, now it even works % for i in *; do [[ -d $i ]] && ( cd $i; [[ -d .git ]] && git gc --aggressive; cd .. ); done22:21
← pantsman- left22:22
→ sohail joined22:22
← dreiss left22:23
→ Life-Blood joined22:24
→ dsdeiz joined22:24
→ BlaDe^ joined22:24
BlaDe^ hi all22:24
I merged devel to master... and there were conflicts, I resolved via checkout --theirs and that didn't work for one22:25
osse qsuscs: for i in */; then you don't need the [[ -d ]] test22:25
BlaDe^ a git diff shows changes between master and devel, but merge says up to date22:25
what should I do?22:25
osse BlaDe^: that you merged two branches doesn't mean they're equal22:25
→ paulweb5151 joined22:25
BlaDe^ osse: how do I make them equal?22:25
← LifeBlood left22:25
qsuscs osse: something with find -name .git -execdir … would be probably even better …22:25
(as a side effect of that one, i can warm my handy pretty well on my notebook, it reports almost 80°C)22:26
osse BlaDe^: merge the other way afterwards22:26
→ sinequanon joined22:26
← paulweb515 left22:27
→ msmith joined22:29
← ManikM left22:29
→ ManikM joined22:29
← BlaXpirit left22:29
← palcu left22:30
→ palcu joined22:30
→ iamjarvo joined22:32
→ [gmi] joined22:33
← tier left22:33
← FabTG left22:34
→ Tuna-Fish joined22:34
→ dialeth_ joined22:35
← kermit left22:35
→ nutron joined22:35
← b4rbz left22:35
← palcu left22:35
← sinequanon left22:35
→ kermit joined22:35
← [gmi] left22:36
→ bollullera joined22:36
← livingstn left22:36
← aswen left22:36
← dtrott left22:37
← alekks left22:38
← dialeth left22:38
→ lamba joined22:39
← cagedwisdom left22:40
← ianbrandt left22:40
→ FabTG joined22:41
lamba Think i require ancient jedi wisdom. I know i can partially add a file, but can i partially apply from a diff ? I've a branch with one commit that i want to split up into serperate branches each of one smaller commit. I was intending to do a diff, then apply sections of the resulting diff file into each new branch. - Assuming that's the right way to even approach the problem ?22:42
← EvilPenguin left22:43
→ EvilPenguin joined22:44
→ metateck joined22:44
→ s8321414 joined22:44
← richardlitt left22:44
← PCatinean left22:45
→ kukks joined22:46
→ martinklepsch joined22:46
← jheg left22:46
→ dtrott joined22:48
← EvilPenguin left22:48
→ EvilPenguin joined22:50
← nettoweb left22:51
→ ianbrandt joined22:52
← s8321414 left22:52
→ s8321414 joined22:52
→ Sadi joined22:52
→ lidaaa joined22:53
→ teamnoir joined22:54
→ moritzschaefer joined22:54
teamnoir Can I sign a commit after-the-fact?22:54
Can I sign a rebase?22:55
→ Dougie187 joined22:55
lamba teamnoir: have you pushed that commit elsewhere ?22:56
← sinkensabe left22:56
teamnoir lamba: not yet22:56
→ desposo joined22:57
← hich left22:58
lamba im no pro (at all). but i think you should be able to reset (not --hard) to the previous commit, then re-do the signing step. hopefully someone who knows git better will be awake.22:58
→ DonRichie joined22:58
→ folken joined22:58
← Technocrat left22:59
← EvilPenguin left22:59
MadLamb there is a file removed in my gitignore and keeps appearing in "changes to be commited" my git status22:59
→ kesroesweyth joined22:59
folken Hi, I'm sorry I'm turning nuts with git.. I'd like to know how i can pull a remote repository into a local new branch without any of my modifications?22:59
kadoban MadLamb: .gitignore has no effect on already-tracked content.23:00
folken: 'git fetch && git checkout -b newname --track someremote/someremotebranch'23:02
← s8321414 left23:02
← baweaver left23:03
→ s8321414 joined23:03
folken kadoban: ah, i see i need to set the tracking to the remote branch. Thanks for the help23:03
kadoban folken: Well, you don't need to, but it's a good default.23:03
← skylite left23:03
← StarManta left23:04
← dtrott left23:04
→ Consuela joined23:05
← martinklepsch left23:05
→ pmallya joined23:06
← pmallya left23:06
← smccarthy left23:06
→ pmallya joined23:06
← DonRichie left23:07
← msmith left23:07
← axl_ left23:08
lamba nvm, found a better way (reset then add -p)23:08
→ axl_ joined23:08
→ DonRichie joined23:09
← Rixius left23:09
← gutoyr left23:10
← faylite left23:10
← corni left23:10
← axl_ left23:11
← Dudi left23:12
← tranzfus_ left23:13
→ kopparam joined23:13
← ianbrandt left23:14
→ b4rbz joined23:15
→ Technocrat joined23:16
← blackmesa left23:16
→ EminenceHC joined23:16
→ CustosL1men joined23:16
← delight left23:17
→ kcj joined23:18
← kopparam left23:19
→ dreiss joined23:21
← EminenceHC left23:21
← Kicer86 left23:21
← ben_alman left23:22
→ otter768 joined23:22
← ra0 left23:23
← awkwardusername left23:24
→ ben_alman joined23:24
← bb010g left23:27
← otter768 left23:27
← metateck left23:27
← gccostabr left23:27
→ Freemason joined23:28
Freemason https://www.youtube.com/watch?v=NUuhPFFIc60#t=4523:28
→ baweaver joined23:31
← thedodd left23:31
← Freemason left23:31
ChanServ set mode: +o23:32
→ Gizburdt joined23:32
offby1 cringes23:32
→ Freemason joined23:32
Eugene changed the topic to: Welcome to #git, the place for git help and the coming winter | Current stable version: 2.1.3 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | When you play the game of clones, you merge or you reset --hard.23:32
Eugene set mode: -o23:32
← Life-Blood left23:32
← ascarter left23:32
← bollullera left23:33
← JanC left23:33
← Freemason left23:34
Sasazuka when I merge if I omit "origin" does it mean it takes my changes in my local branch as opposed to the stuff I have pushed? e.g. git merge --squash feature/BLAH23:34
→ Freemason joined23:34
Freemason → pasokk23:34
Sasazuka or are they the same?23:34
← Technocrat left23:35
offby1 Sasazuka: the command you showed us will create a merge commit whose parents are your current HEAD, and the feature/BLAH branch.23:35
I have no idea what you've pushed.23:36
← Gizburdt left23:36
Sasazuka I meant to ask if "git merge --squash origin/feature/BLAH" is equivalent to "git merge --squash feature/BLAH"23:37
offby1 if the refs origin/feature/BLAH and feature/BLAH are pointing to the same commit, then yes.23:37
do "git show --stat origin/feature/BLAH feature/BLAH"; see if they're the same.23:37
Sasazuka so in other words, not always equivalent ?23:38
← phantombeta left23:38
← jagob left23:38
offby1 not necessarily.23:39
← BHSPiMonkey left23:39
offby1 Those are two different refs; there's no law that says they will always point to the same commit.23:39
(If they did, there'd be no point having both of them.)23:39
Now, in practice, you may find that they are _usually_ pointing at the same commit ... or one of them might even be an abbreviation for the other, in which case they would indeed always be the same. But I'm not certain that's the case.23:40
← wrouesnel3 left23:40
Sasazuka is it just changes that are committed but not pushed?23:40
← marchdown left23:40
→ Bryzzle joined23:41
Sasazuka AFAIK that's the only difference between them but I'm not sure if there's anything else23:41
→ jaredr_ joined23:41
← kukks left23:43
→ richardlitt joined23:43
→ samsquanch joined23:43
← jonatasnona left23:45
← kcj left23:45
← jaredr_ left23:46
← dreiss left23:46
→ JanC joined23:47
← King_Hual left23:47
offby1 I wouldn't know, since I can't see your computer23:47
← dsantiago left23:47
offby1 Sasazuka: you should run "gitk --all"; it makes everything wonderfully clear23:47
→ dsantiago joined23:49
Sasazuka I never did understood the "transit map" that git has haha23:50
← virtualsue left23:51
→ hgl joined23:52
← paul424 left23:52
← in_deep_thought left23:53
← fstd left23:54
← zvpun left23:54
← vurma left23:55
← hgl left23:56
→ boombatower joined23:57
← boombatower left23:57
→ boombatower joined23:57
→ dreiss joined23:59
← nnyk_ left23:59
← liamkeily left23:59

Logs Search ←Prev date Next date→ Channels Documentation