Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-25

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

All times shown according to UTC.

Time Nick Message
00:00 Darren_ joined #git
00:00 multi_io if I do that, it lists 'dirty merge' commit, but nothing before it
00:02 Seveas I think the rename detection is being weird here. Maybe because adding the subtree renamed too many files
00:04 maroloccio joined #git
00:04 Noldorin joined #git
00:05 kyan joined #git
00:06 multi_io hm yeah, that explanation makes sense
00:06 multi_io so it may have nothing to do with the subtree directly
00:06 multi_io or the fact that the combined repo has two roots
00:08 Seveas --full-history should help with that
00:08 Gsham joined #git
00:10 Seveas I think it's the rename limit
00:10 eblip joined #git
00:12 derk0pf joined #git
00:13 SwiftMatt joined #git
00:13 * multi_io investigates
00:13 Seveas hmm, added a tiny repo as subtree as well: no output for those files either
00:13 Seveas if you find out, let me know. I'm off to bed in a minute :)
00:14 multi_io will do. Thanks for your insights, very helpful. night. :D
00:15 multi_io hey, you work at booking.com
00:16 xock_stream joined #git
00:16 Seveas yes
00:16 multi_io say hello to K. Koehntopp from me :D
00:17 multi_io (if you know/see him)
00:17 Seveas Yeah, I've known him for the last 8 years (except when he took a holiday to be with you guys :)
00:18 multi_io :P
00:20 einnjo joined #git
00:23 creppe joined #git
00:25 Nicmavr joined #git
00:25 bodhi joined #git
00:25 Nicmavr joined #git
00:27 cqi joined #git
00:30 nettoweb joined #git
00:30 aspiers joined #git
00:34 rebrec joined #git
00:35 __name__ joined #git
00:36 dar123 joined #git
00:36 esc joined #git
00:37 dodobrain joined #git
00:37 alex1a joined #git
00:37 eb0t joined #git
00:41 texinwien_ joined #git
00:43 eb0t joined #git
00:47 pdgwien joined #git
00:47 inflames joined #git
00:47 cqi joined #git
00:47 syg_ joined #git
00:47 syg__ joined #git
00:50 NeverDie joined #git
00:50 lindenle joined #git
00:51 ToBeCloud joined #git
00:54 mischat joined #git
00:56 duvnell joined #git
00:58 tvw joined #git
01:01 tvw joined #git
01:02 sarbs joined #git
01:11 monsterco joined #git
01:11 syg__ joined #git
01:11 monsterco hi everyone; is there anyway I can get a quick number count of lines added, or modified in a push?
01:11 monsterco i use pure Git
01:11 monsterco i see many files updated but like to know number of lines worked on
01:12 inflames joined #git
01:15 jaguarmagenta joined #git
01:20 phroa git diff --stat or --shortstat oldrevision..newrevision
01:24 bocaneri joined #git
01:26 a_thakur_ joined #git
01:28 nettoweb joined #git
01:34 manfredn joined #git
01:44 snthsnth joined #git
01:51 msonntag joined #git
01:55 rbern joined #git
01:55 mischat joined #git
02:01 qws-user-1228 joined #git
02:17 a_thakur joined #git
02:18 flavius joined #git
02:19 d^sh joined #git
02:20 rchavik joined #git
02:20 mozzarella joined #git
02:20 dsdeiz joined #git
02:22 anuxivm joined #git
02:24 Urbany joined #git
02:24 buffal0 joined #git
02:25 hahuang65 joined #git
02:25 finalbeta joined #git
02:25 buffffal00 joined #git
02:28 monsterco left #git
02:29 pks joined #git
02:30 snthsnth joined #git
02:32 CheckDavid joined #git
02:36 sexy00masry joined #git
02:39 sexy00masry left #git
02:45 jaguarmagenta joined #git
02:46 barteks2x I have a repository (already clones) that in older versions had some submodules, but they are no longer there. And I used git checkout to go back to these versios. How to get these submodules working?
02:46 barteks2x *already cloned
02:46 ugjka joined #git
02:47 realz joined #git
02:50 buffal0 joined #git
02:50 nikanj joined #git
02:51 nikanj Hi all
02:51 gitinfo nikanj: 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.
02:51 nikanj So my git log --pretty=format:"%ci" produces dates as expected, but git log --pretty=format:"%cI" produces just %cI
02:52 Vampire0 joined #git
02:52 nikanj This is with git 2.1.4 on babun
02:53 nikanj Not sure if I'm not understanding the command right, or if there's a weird bug here
02:54 nikanj Ok, great news is it seems to work in git 2.10.
02:54 nikanj I guess someone already fixed that bug
02:55 barteks2x I got it working already with command: git submodule update --init --recursive
02:56 nikanj left #git
02:56 mischat joined #git
02:58 aavrug joined #git
02:58 NeverDie joined #git
03:01 a_thakur joined #git
03:08 buffffal00 joined #git
03:09 Hez joined #git
03:12 chachasmooth joined #git
03:14 breezy_ joined #git
03:14 valkyrie joined #git
03:14 JanC_ joined #git
03:17 breezy_ joined #git
03:19 mizu_no_oto joined #git
03:19 jaguarmagenta joined #git
03:21 hexagoxel joined #git
03:24 Dragonbird joined #git
03:25 Andrew_K joined #git
03:25 _Hez joined #git
03:26 jimi_ joined #git
03:27 NeverDie joined #git
03:30 buffal0 joined #git
03:31 lindenle joined #git
03:32 davimore_ joined #git
03:44 lb1c joined #git
03:45 azerus joined #git
03:48 hahuang65 joined #git
03:49 a_thakur joined #git
03:53 pks joined #git
03:55 barteks2x I have a weird issue with git bisect, I select good commit as something from 2014, bad as something from 2015 and it startx bisecting at commit from 2013 that I don't even know how to compile because it's so old
03:57 mischat joined #git
04:00 barteks2x what could cause that?
04:04 sunri5e joined #git
04:06 pdgwien joined #git
04:07 Sasazuka joined #git
04:15 SwiftMatt joined #git
04:15 Vortex34 joined #git
04:16 arescorpio joined #git
04:17 davimore joined #git
04:24 netj joined #git
04:25 armyriad joined #git
04:26 rchavik joined #git
04:26 harrymoreno joined #git
04:29 Mobutils joined #git
04:38 leeN joined #git
04:39 Mobutils joined #git
04:42 ayjay_t joined #git
04:43 dreiss joined #git
04:46 donmichelangelo joined #git
04:46 fstd_ joined #git
04:47 navidr joined #git
04:48 Doginal joined #git
04:49 subhojit777 joined #git
04:51 qws-user-1228 joined #git
04:53 fahadash joined #git
04:55 byte512 joined #git
04:57 mischat joined #git
04:58 lindenle joined #git
05:00 clemf joined #git
05:06 robotroll joined #git
05:06 Rickmasta joined #git
05:07 mozzarella joined #git
05:09 rscata joined #git
05:11 Cabanossi joined #git
05:11 Dragonbird joined #git
05:16 ayjay_t joined #git
05:20 A5101 joined #git
05:20 tristanp joined #git
05:23 ayogi joined #git
05:28 breezy_ joined #git
05:30 hahuang65 joined #git
05:32 therealGent joined #git
05:34 eb0t joined #git
05:35 jimi_ joined #git
05:39 meloc joined #git
05:39 meloc joined #git
05:43 zulutango joined #git
05:45 phanimahesh joined #git
05:49 SwiftMatt joined #git
05:52 govg joined #git
05:58 mischat joined #git
06:02 rchavik joined #git
06:08 cqi joined #git
06:08 byte512 joined #git
06:10 brendyn joined #git
06:15 SwiftMatt joined #git
06:15 BSaboia joined #git
06:18 eivarv joined #git
06:21 dsantiago joined #git
06:24 Macaveli joined #git
06:25 timothy joined #git
06:27 Darren_ joined #git
06:28 gaby1591 joined #git
06:28 eivarv joined #git
06:30 gaby1591 left #git
06:31 basiclaser joined #git
06:38 hhee joined #git
06:38 qt-x joined #git
06:41 MrWoohoo joined #git
06:43 Vampire0_ joined #git
06:43 ome joined #git
06:44 Rickmasta joined #git
06:48 zacts joined #git
06:49 pdgwien joined #git
06:51 cagedwisdom joined #git
06:51 ThomasLocke joined #git
06:51 ThomasLocke joined #git
06:53 ngperfex joined #git
06:54 Mobutils joined #git
06:54 ngperfex joined #git
06:56 LucaTM joined #git
06:59 zeroed joined #git
06:59 mischat joined #git
07:02 xall joined #git
07:03 fees joined #git
07:06 osse barteks2x: Merge history might make that old commit count as "between" the good and the bad
07:07 barteks2x I already found the problem without bisect
07:14 chele joined #git
07:14 Puffball_ joined #git
07:15 zeroed joined #git
07:15 mozzarella joined #git
07:25 spriz joined #git
07:25 Macaveli joined #git
07:26 JeroenT joined #git
07:28 sundev70 joined #git
07:28 snthsnth joined #git
07:29 lordjancso joined #git
07:35 leb joined #git
07:35 overlord_tm joined #git
07:37 jnavila joined #git
07:39 rominronin joined #git
07:39 Sceorem joined #git
07:40 Alienpruts joined #git
07:41 venmx joined #git
07:43 JeroenT_ joined #git
07:44 johnlage joined #git
07:44 hanthings joined #git
07:44 osse barteks2x: something like this maybe: http://sprunge.us/bTeb
07:45 barteks2x unlikely but possible. I wasn't able to figure it out
07:45 osse ooor maybe the date is just weird because it's been rebased or something
07:46 barteks2x no it wasn't rebased that was clearly the very old version
07:46 barteks2x (well, it could be rebased somewhere but not in that way)
07:47 barteks2x the project has separate branches for each major version
07:47 barteks2x and I was trying to bisect between 2 major versions
07:47 barteks2x but each next major version starts somewhere from the previous one
07:48 barteks2x and that weird commit from 2013 was a merge commit by itself
07:50 dreiss joined #git
07:50 DieguezZ joined #git
07:51 osse bisect will check the range  good..bad, aka. all commits reachable from bad, but not from good. merges and whatnot make that not simply a straight line, like i showed. If your version branches form a sort of Y shape then I suppose this might happen
07:52 ahmedelgabri joined #git
07:52 osse at least it's the only explanation i can think of
07:53 barteks2x when I viewed git log --oneline --graph  it was extremely hard to follow and so I can't really say for sure
07:54 osse you said you already found the problem, so I guess we'll let bygones be bygones :P  But for next time,  git bisect --skip might alleviate some pain.
07:54 barteks2x git bisect wouldn't have worked anyway
07:55 barteks2x the code that introduced the issue was added close to the beginning of the project, and I would have no idea how to compile and run that. If it would work at all
07:55 re1_ joined #git
07:55 finalbeta joined #git
07:56 barteks2x but because the issue appeared more or less randomly I though it's not there in that version I marked as good
07:57 vuoto joined #git
07:59 mischat joined #git
08:01 TomyWork joined #git
08:10 gfloys joined #git
08:15 derphilipp joined #git
08:16 osse ahh, heisenbugs
08:16 osse the best kind
08:16 meauses joined #git
08:16 derphilipp Why does an interactive rebase with me wanting to fixup multiple commits into one result in errors of commits not being able to be applied? i do not hav any branches etc. in my history and only want to remove the multiple "Work in progress" commits I did on this project form its history
08:18 dan2k3k4 joined #git
08:22 dcpc007 joined #git
08:24 osse derphilipp: do you reorder them?
08:25 encod3 joined #git
08:25 finalbeta joined #git
08:26 osse derphilipp: if you have commits A, B and C, and you reorder them so it's A, C, B, then you might get conflicts if the changes in C expect the contents of B to be present.
08:28 mindriot101 joined #git
08:29 dan2k3k4 joined #git
08:29 a_thakur joined #git
08:29 jknetl joined #git
08:30 gyjbvcfuujh joined #git
08:31 jiangfb joined #git
08:32 BigDawg joined #git
08:32 netj joined #git
08:33 Andrew_K|2 joined #git
08:33 Andrew_K joined #git
08:35 gyjbvcfuujh joined #git
08:36 johnville joined #git
08:37 adac joined #git
08:37 hahuang65 joined #git
08:39 johnville joined #git
08:42 elect joined #git
08:43 dodobrain joined #git
08:43 ngperfex joined #git
08:43 elastix joined #git
08:45 derphilipp osse:  no, i just want to 'fixup' some inbetween
08:45 derphilipp so instead of A B C D E F i have A B F
08:45 osse C,D and E are fixups to B ?
08:51 Rodya_ joined #git
08:52 jiangfb left #git
08:54 jiangfb__ joined #git
08:58 davimore_ joined #git
08:59 prg3 joined #git
08:59 cagedwisdom joined #git
09:03 qws-user-1228 joined #git
09:03 kedare joined #git
09:03 robattila256 joined #git
09:08 kurkale6ka joined #git
09:08 JeroenT joined #git
09:11 MrMojito joined #git
09:12 derphilipp correct
09:13 derphilipp osse basically i just want to get rid of them as they are very minor commits that shall be bundled into larger commits
09:16 julius_ joined #git
09:16 ahmedelgabri joined #git
09:19 osse derphilipp: in that case I don't know why you get conflicts
09:20 osse assuming the order of commits are the same, except their squashed in the order they were corrected
09:20 osse I have no answer
09:21 marcogmonteiro joined #git
09:21 derphilipp osse:  okay, I dont understand why this happens either…
09:21 xocket joined #git
09:21 osse ... I must admit I suspect the order is actually a bit differnet :p
09:22 derphilipp wenn perhaps i do something wrong: i am just doing a "git rebase -i —root" and change multiple commits to "f"
09:23 osse and you do NOT reorder lines?
09:23 derphilipp nope, why should I :)
09:25 canton7 are you *sure* you don't have any branches?
09:25 canton7 maybe pastebin the output of !lol ?
09:25 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
09:26 derphilipp canton7:  oh, you are absolutely right! that actually branching did happen!
09:27 derphilipp canton7:  i totally overwatched that, sorry
09:27 canton7 :)
09:27 xock_stream joined #git
09:27 canton7 osse was right to question your assumptions, but questioned the wrong one :P
09:28 PCatinean joined #git
09:29 derphilipp But I was the one who did blantanly overwatch it, so I want to explicitly state my excuse to you can osse; Thank you guys, that really helps a lot!
09:29 DieguezZ joined #git
09:29 Alienpruts joined #git
09:29 LucaTM joined #git
09:31 rts-sander joined #git
09:31 courrier joined #git
09:32 chll_ joined #git
09:35 Serpent7776 joined #git
09:38 mindriot101 joined #git
09:39 hahuang65 joined #git
09:40 Nicmavr joined #git
09:41 Nicmavr joined #git
09:43 subhojit777 joined #git
09:51 thebope_ joined #git
09:51 adymitruk joined #git
09:51 BSaboia joined #git
09:52 d0nn1e joined #git
09:53 BSAlb joined #git
09:54 texinwien_ joined #git
09:54 BSab joined #git
09:57 lindenle joined #git
09:58 elect joined #git
09:59 xall joined #git
10:05 rominronin joined #git
10:05 Merak left #git
10:08 mischat joined #git
10:08 BackEndCoder joined #git
10:08 mischat joined #git
10:09 GavinMagnus joined #git
10:09 a_thakur joined #git
10:10 a_thakur joined #git
10:10 Cymew joined #git
10:12 King_Hual joined #git
10:13 rnsanchez joined #git
10:13 Cymew If I realize my work was going down a wrong track, but I might want to reuse some of it in the future, can I branch off that code in a new branch (a), then go back to the parent branch (b) and revert 4-5 commits and go forward after that on that branch, or have I now "cut off" my (a) branch so it will create problems if I want to merge things from that into the future of (b)?
10:14 derphilipp How can I interactive-rebase the history if there is a branch inside of it? (i basically want all of that parallel development squashed into a single commit;
10:14 moritz well, squash the commits
10:15 derphilipp but that results in problems that the commits cannot be applied and i manually have to merge files - though in the history i have already merged them once and want to use that result
10:16 King_Hual joined #git
10:16 King_Hual joined #git
10:17 djb-irc joined #git
10:17 cagedwisdom joined #git
10:19 snthsnth joined #git
10:22 dodobrain joined #git
10:22 seishun joined #git
10:23 Macaveli joined #git
10:24 seishun joined #git
10:26 cbreak derphilipp: it's somewhat easy to do yourself
10:26 cbreak make a new branch at the starting point
10:26 cbreak cherry-pick the commits you do want
10:26 cbreak then git merge --squash the branch you want to have squash merged
10:26 cbreak you can also cherry-pick the merge commit
10:27 JeroenT_ joined #git
10:27 cbreak it won't be an interactive rebase, but a manual interactive rebase :D
10:27 Macaveli joined #git
10:27 dreiss joined #git
10:27 xocket joined #git
10:27 buzzLightBeer joined #git
10:31 subhojit777 joined #git
10:35 dan2k3k4 joined #git
10:36 rominronin joined #git
10:42 nd_ joined #git
10:44 GT4066 joined #git
10:54 JeroenT joined #git
10:56 JeroenT joined #git
10:58 noidea joined #git
10:59 _ikke_ Just gave a git intro here to colleagues
11:00 bremner well, they didn't kill you, so that's a plus
11:00 txdv do they see the benefits of using git?
11:01 txdv i mean, understand
11:10 Camusensei joined #git
11:11 ugjka joined #git
11:11 mischat joined #git
11:13 CrazyBonz joined #git
11:14 rominronin joined #git
11:15 Camusensei Hello guys. I'm trying to add a new remote on a repo I've been working on for years, as I usually do.... But this time git hangs when I try to fetch from that new remote. BG info: I'm on cygwin, the remote is a bitbucket instance. I can clone+fetch that repo but not use my usual working directory with my work...
11:15 elastix joined #git
11:17 sarbs joined #git
11:17 cagedwisdom joined #git
11:17 Camusensei oh, now it worked. Looks like repeatedly trying was the solution. git 2.8.3 either that was a connection problem (every time I tried, I had another "POST git-upload-pack " line) or a race condition. In any case it's solved :)
11:21 aavrug joined #git
11:21 jaguarmagenta joined #git
11:22 aavrug joined #git
11:22 rebrec joined #git
11:22 aavrug joined #git
11:23 aavrug joined #git
11:23 xall_ joined #git
11:26 jimi_ joined #git
11:27 derphilipp cbreak: in the end all i want to do is get rid of commits - and not their content, but they shall all be melted into multiple (then larger) commits instead of extremely tiny steps
11:28 xock_stream joined #git
11:29 dsdeiz joined #git
11:29 dsdeiz joined #git
11:29 bongjovi joined #git
11:34 solf1re joined #git
11:34 rorro joined #git
11:40 Camusensei derphilipp: rebase -i with "fixup" for all but one commit
11:42 GavinMagnus left #git
11:42 Qria joined #git
11:43 paladinn joined #git
11:43 paladinn joined #git
11:44 indistylo joined #git
11:45 a_thakur joined #git
11:45 JeroenT joined #git
11:47 filter85 joined #git
11:47 mindriot_ joined #git
11:47 a_thakur joined #git
11:48 Shentino joined #git
11:48 sarbs joined #git
11:49 filter85 joined #git
11:49 xall_ joined #git
11:49 filter85 joined #git
11:50 mikecmpbll joined #git
11:50 hariel joined #git
11:51 mikecmpbll joined #git
11:52 venmx joined #git
11:56 JeroenT joined #git
11:57 tvw joined #git
11:58 sarbs joined #git
11:58 Alienpruts joined #git
11:58 k200 joined #git
11:59 k200 while solving conflict, i see <<<HEAD content in red ==== content in green /upstream/myrepo which one am I supposed to keep?
11:59 _ikke_ Only you can decide
11:59 cbreak both
12:00 seishun joined #git
12:01 k200 ??
12:01 jimi_sanchez joined #git
12:02 seishun joined #git
12:03 cbreak k200: the semantic of a merge is to keep the changes from both sides
12:04 k200 ok
12:04 k200 dont get it
12:05 jknetl joined #git
12:05 txdv k200: its simple
12:06 txdv there are changes in A and in B in the same area
12:06 txdv it can't merge them, you have to take a look and do that merge yourself
12:07 systemovich joined #git
12:10 canton7 k200, make the file look how you want it to look
12:11 kadoban joined #git
12:13 aswen joined #git
12:13 tobiasvl k200: !eek
12:13 gitinfo k200: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
12:14 afuentes joined #git
12:15 zeroed joined #git
12:15 zeroed joined #git
12:24 elsevero joined #git
12:27 xocket joined #git
12:30 jeffreylevesque joined #git
12:32 git_student joined #git
12:32 Gloomy joined #git
12:33 git_student hello! Please tell, how to show all parents commits width first?
12:35 JeroenT_ joined #git
12:36 tobiasvl git_student: width first?
12:39 xocket joined #git
12:40 mischat joined #git
12:42 seishun joined #git
12:43 a_thakur joined #git
12:49 thierryp joined #git
12:52 re1 joined #git
12:52 git_student <tobiasvl>  yes, actually I need to find first ancestor with tag A.
12:53 TomyWork joined #git
12:53 git_student width first  == first parents that commits width depth 2, than 3, etc
12:54 dreiss joined #git
12:54 f3r70rr35f joined #git
12:54 vinix joined #git
12:55 CheckDavid joined #git
12:56 dendazen joined #git
12:58 seishun joined #git
13:00 fahadash joined #git
13:02 JeroenT joined #git
13:03 gamester joined #git
13:04 ayogi joined #git
13:04 anddam joined #git
13:08 anddam I cloned a repo for which I have commit rights, I want to keep a dirty branch local-only, sort of pre-work-in-progress. Passing a branch refspec to push command is going to only push that branch, right?
13:08 anddam that is running    push origin master   is not going to push my-dirty-branch as well
13:09 canton7 correct
13:09 canton7 also, the behaviour of 'git push' is configured by the 'push.default' setting, see man git-config
13:09 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
13:09 canton7 in any reasonably newish version of git, 'git push' will only push the current branch
13:09 canton7 (in order gits, it'll push everything for which a matching branch exists on the remote)
13:09 anddam canton7: yes, I got that same info from git help push
13:10 canton7 *in older gits
13:10 anddam canton7: that's an interesting feature, I wonder if mercurial does as well
13:12 hardenedapple joined #git
13:12 b100s joined #git
13:12 b100s hi2all
13:13 b100s how can i remove unmerged path from conflict section?
13:13 b100s merge is come from 'git stash pop'
13:13 b100s and i cant say --ours, isnt it?
13:14 b100s i have to take version from branch, not from stash
13:14 b100s done : )
13:14 b100s thanks
13:15 indistylo [Off Topic]Hello Folks, Is there any tool online or linux based which can do video editing like this https://m.youtube.com/watch?v=rbRieFzbZXA
13:18 synthroid joined #git
13:20 joakimk joined #git
13:20 ProbabilityMoon joined #git
13:21 joakimk I set up a GitHub repos, with a .gitignore file, but "git push origin master" fails
13:21 joakimk thing seems to be that I also have a local .gitignore file, on my PC
13:22 jaguarmagenta joined #git
13:22 joakimk what's the easiest way to resolve this? I mean, I guess I could create a *new* (remote) repos (on GitHub), with NO gitignore, and push to that instead?
13:22 jozwior joined #git
13:22 joakimk but that seems to be the wussy way out
13:23 joakimk current status is, I've added all files locally (barring those filtered by my local .gitignore), and I've done "git commit"
13:23 joakimk I've also set the "remote origin" to point to the GitHub repos
13:24 solf1re joined #git
13:25 joakimk OK, figured it out. Use the -f to force push :)
13:30 anddam canton7: I'm on master and I modified a bunch of files, can I checkout -b a new branch and commit there or will that reset the modified files to current head?
13:30 anddam geez I lack the proper lingo
13:30 canton7 anddam, it'll !float
13:30 gitinfo anddam: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
13:31 canton7 (so what you expect)
13:31 anddam oh the checkout will fail, that's good so you know something's clashing
13:32 anddam I never quite got the stashing, it's like hiding the dust under the carpet taking a mental note to sort it later, right?
13:32 canton7 yeah, either it'll succeed, and keep the files, or fail, and keep the files. It won't nuke those files
13:32 canton7 it's like creating a temporary branch, but a bit more temporary
13:32 anddam a "tempotemporary"
13:32 canton7 heh
13:32 derphilipp left #git
13:33 canton7 for something like moving uncommitted changes between branches, it a lot more convenient to stash than to commit, rebase, reset
13:35 Gianormagantrous joined #git
13:38 anonymuse joined #git
13:40 jaguarmagenta joined #git
13:43 mindriot101 joined #git
13:44 polyrob_ joined #git
13:44 vrlx joined #git
13:44 JeroenT joined #git
13:46 MalteTimmermann[ joined #git
13:46 jimi_ joined #git
13:47 djb-irc joined #git
13:52 roelmonnens joined #git
13:53 zivester joined #git
13:53 geoid_ joined #git
13:54 Jackneillll joined #git
13:57 ShekharReddy joined #git
13:57 rnsanchez_ joined #git
14:03 thierryp_ joined #git
14:05 venmx joined #git
14:05 Nicmavr joined #git
14:05 djb-irc joined #git
14:05 shinnya joined #git
14:06 Gonzo89 joined #git
14:06 cheater joined #git
14:06 cheater hi
14:07 cheater i'm looking for something like git log, but it would show me the commit id, date, and the amount of characters removed and added in the diff. how would i do that? i'm kind of a newbie with git.
14:08 Masber joined #git
14:08 Zarthus sounds like `git show $git_sha`
14:08 Zarthus you can also include the diff in the git-log itself, it's pretty flexible
14:09 canton7 there are a much of flags to log/show/diff with 'stat' in the name which show lines added/removed
14:09 sdothum joined #git
14:09 mischat joined #git
14:09 cheater git show shows the diff, as does git -p, i'm looking specifically for the amount of chars in + and - lines of the diff
14:09 _ikke_ right, lines, not characters (because diff primarily works with lines
14:09 canton7 see e.g. 'git show --shortstat'
14:10 _ikke_ Still deals with whole lines
14:10 cheater ok, that's sorta what i'm looking for
14:10 canton7 true: I don't know of anything which deals with just characters
14:10 cheater but i need to put this in some sort of csv form or something like that
14:11 cheater for every commit i need the hash, date, and the number of insertions and the number of deletions
14:11 cheater so that i can make a graph
14:11 solf1re joined #git
14:12 tobiasvl git log --shortstat
14:12 cheater yeah tobiasvl i tried that out but it still gives me a format that can't easily be parsed
14:12 tobiasvl parsed how? doesn't look too hard to parse
14:13 cheater i don't want to write a hacky parser, i was hoping git could output that stuff itself with --pretty-format
14:13 cheater er --pretty=format
14:14 xall_ i want to grab someones pull request that hasn't been accepted yet. what's an easy way to do that?
14:15 canton7 cheater, --numstat ? That's designed for machine parsing
14:15 tobiasvl xall_: https://help.github.com/articles/checking-out-pull-requests-locally/
14:16 zeroed joined #git
14:18 xall_ tobiasvl: yeah, that seems tedious. surely there is an automated way?
14:18 cheater canton7: that's pretty cool. i guess there's no way to make it display just a summary across all files?
14:18 Starky joined #git
14:18 canton7 never come across one
14:19 cheater that's pretty close though
14:19 cheater is there a way to make it display the stat only? no other info?
14:20 _ikke_ cheater: at least --format=""
14:21 canton7 yeah, that works. Doesn't let you tell where one commit starts and another ends, if you're using it with 'git log' though
14:22 wcpan joined #git
14:22 _ikke_ You can always do something like --format="#########"
14:22 cheater oh yeah --format="" works. i wondered how i could do this
14:22 mindriot_ joined #git
14:23 venmx joined #git
14:25 wcpan joined #git
14:29 altendky joined #git
14:30 Guest89194 joined #git
14:31 JeroenT joined #git
14:31 todd_dsm joined #git
14:32 niels_ joined #git
14:36 niels_ Hi all. How do I tell .gitignore that I want to ignore dirs foo/ and bar/, but one level down. So lets say I have a gitignore in ./root/ and I want to ignore ./root/dir1/foo and ./dir2/bar, but I don't know the names of dir1 and 2
14:36 niels_ sorry ./root/dir2/bar, i Menat
14:37 _ikke_ /*/foo and /*/bar should work
14:37 niels_ _ikke: an asterisk will match just one level? Thanks :)
14:38 _ikke_ niels_: Just one * should indeed just match one dir
14:38 irco joined #git
14:38 _ikke_ ** would match more
14:38 niels_ _ikke: perfect. Thanks a bunch :)
14:38 cheater thanks a lot for the help guys
14:39 cheater i have another question. if i go to the branches view on my project on gitlab i see a lot of branches, but git branch -a just shows master. why is that?
14:39 canton7 cheater, 'git fetch gitlab' first? (using the correct remote name)
14:40 rominronin joined #git
14:40 rorro joined #git
14:40 jimi_ joined #git
14:40 madewokherd joined #git
14:42 mindriot101 joined #git
14:42 a_thakur joined #git
14:44 a_thakur joined #git
14:44 chardan joined #git
14:49 derk0pf joined #git
14:49 bodhi joined #git
14:52 sgtbigman joined #git
14:52 Starky joined #git
14:53 thebope joined #git
14:54 jaguarmagenta joined #git
14:55 dendazen joined #git
14:57 hahuang65 joined #git
14:57 lektrik joined #git
14:58 Rodya_ joined #git
14:59 xall joined #git
15:00 OKS joined #git
15:02 a_thakur joined #git
15:03 al-damiri joined #git
15:06 fmcgeough joined #git
15:07 AaronMT joined #git
15:10 interrobangd joined #git
15:11 Thorn joined #git
15:12 a_thakur joined #git
15:12 systemovich joined #git
15:13 isysd joined #git
15:18 sklv1 joined #git
15:22 geoid joined #git
15:22 Guest68411 joined #git
15:29 dcpc007 left #git
15:30 tvw joined #git
15:33 a_thakur joined #git
15:34 intellix joined #git
15:36 Darren_ joined #git
15:38 leeN joined #git
15:39 tango_ joined #git
15:51 roelmonn_ joined #git
15:53 dan2k3k4 joined #git
15:55 delboy1978uk joined #git
15:56 delboy1978uk hi guys, when i try to git push from my work laptop, it tries my private key, which is not the same as my own laptop's key. However it doesnt ask my uisername and password, it just refuses me. Any advice?
15:57 jerrcs joined #git
15:58 multi_io delboy1978uk: either add you work laptop's public key on the server, or reconfigure the server to allow password authentication
15:58 multi_io or maybe you're just using the wrong username or something
15:58 delboy1978uk its github
15:58 bremner you could use https
15:59 Rodya_ joined #git
15:59 multi_io yeah
15:59 delboy1978uk ah yes. i changed it to git@github.com:delboy1978uk/form.git because i'm behind a firewall
15:59 delboy1978uk using https gave me a proxy connect abort
16:00 multi_io github rules out option 2 (enable pw auth), but not option 1 (ass work laptop's public key to the server)
16:00 multi_io *add
16:00 multi_io ass, lol sorry
16:00 delboy1978uk so i add this key onto github too?
16:00 multi_io yeah
16:01 delboy1978uk this work laptop is ass lol
16:01 delboy1978uk cool, i'll try that
16:01 delboy1978uk thanks
16:02 subhojit777 joined #git
16:03 delboy1978uk its my public key i paste in, right?
16:03 bremner yes
16:04 des_consolado hey what needs to exist on the remote for me to be able to push there from local?
16:05 delboy1978uk the repo?
16:06 delboy1978uk des_consolado: what's your issue?
16:06 Dragonbird joined #git
16:06 des_consolado trying to set up a remote git server thing on my vps - fine to just use the SSH method
16:07 des_consolado I've init'd a repo there on the VPS and I have a repo here locally that I want to push up to there
16:07 des_consolado I've done all this remote origin add / set-url blah blah blah
16:07 des_consolado I must have done it wrong though, I think I don't understand the remote origin URL format
16:07 multi_io des_consolado: usually a working ssh login and the repo in the vps's file system
16:07 des_consolado and how it's supposed to deal with finding the right directory on the server and all this kind of stuff
16:08 des_consolado yeah the repo is there, how do you put the path in the origin url?
16:08 delboy1978uk des_consolado: might be this could help you https://delboy1978uk.wordpress.com/2013/12/03/using-git-push-to-deploy-your-websites/
16:08 multi_io git clone user@server.name.com:/full/path/to/the/repo.git
16:08 delboy1978uk So i just tried adding my key to github, but i get: Key is invalid. It must begin with 'ssh-ed25519', 'ssh-rsa', 'ssh-dss',  'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'.  Check that you're copying the public half of the key
16:09 gamester joined #git
16:09 des_consolado ah ty
16:09 delboy1978uk the only stuff i can see with ssh-rsa is the stuff in my known_hosts file, not my private or public keys. help!
16:09 grawity delboy1978uk: what kind of key were you trying to add?
16:09 grawity SSH or PGP?
16:09 delboy1978uk ssh
16:09 des_consolado multi_io: full path like all the way from /, or full path relative to the user's homedir?
16:09 grawity delboy1978uk: what was the key made with?
16:10 eivarv joined #git
16:10 delboy1978uk putty gen, and i also exported as open ssh format
16:10 multi_io des_consolado: full path should work in any case, maybe you can also have ~ in there for the user's home
16:10 grawity delboy1978uk: you exported the private key
16:11 grawity delboy1978uk: copy the openssh-format public key from the "OpenSSH format public key" box above
16:11 delboy1978uk ah lol, let me try exporting the publiuc key then :-)
16:11 ojdo joined #git
16:11 a_thakur joined #git
16:11 grawity the "save public key" button saves in RFC4716 format
16:11 encod3 joined #git
16:12 delboy1978uk grawity: thanks a lot! it has been months since i used putty gen, as soon as i loaded my private key, there it was right at the top. Thanks a lot!
16:13 grawity the UI is pretty weird tbh
16:13 grawity you set parameters at the bottom, click 'Generate' in the middle, it shows the result at the top
16:13 grawity half the export options are buttons, half are menus
16:14 delboy1978uk Awesome, I just git pushed. Thanks so much grawity!
16:15 harrymoreno joined #git
16:19 mizu_no_oto joined #git
16:19 tvw joined #git
16:21 anuxivm joined #git
16:21 pks joined #git
16:21 mindriot101 joined #git
16:22 edaught joined #git
16:23 edaught joined #git
16:23 encod3 joined #git
16:23 Gloomy joined #git
16:24 mizu_no_oto joined #git
16:25 NeverTired joined #git
16:29 jccn joined #git
16:29 Dragonbird joined #git
16:30 vuoto joined #git
16:30 Groscheri joined #git
16:31 mischat joined #git
16:31 mischat joined #git
16:32 mischat joined #git
16:33 mischat joined #git
16:34 anonymuse joined #git
16:41 thebloggu joined #git
16:42 aranea joined #git
16:42 aranea Hi. I'm having trouble accessing the archive of the git@vger mailing list on gmane. Are there any other copies of the mailing list's archive?
16:44 xall joined #git
16:44 grawity http://public-inbox.org/git/
16:44 grawity GMANE also still works over NNTP, as does PI
16:46 Dragonbird joined #git
16:46 aranea Thanks! I'll go with http://PI, since I've never bothered to set up an NNTP reader on my systems.
16:46 Noldorin joined #git
16:48 vuoto joined #git
16:50 vuoto joined #git
16:55 nicksloan joined #git
16:57 dar123 joined #git
16:58 vktec joined #git
16:58 vktec What's the best way to remove a submodule? git submodule deinit foo and then edit .gitmodules?
16:59 aranea vktec: I think so. That's how I always do it, anyway.
16:59 Rodya_ joined #git
17:00 aranea There's no "git submodule remove" command, unfortunately.
17:00 vktec Okay, I'll go with that unless there are any other suggestions
17:02 tristanp_ joined #git
17:03 aranea vktec: Come to think of it, you have to do a "git rm foo/", too. (After the deinit, of course.)
17:03 vktec Well, I've not actually committed the submodule yet :)
17:03 aranea Okay then. :)
17:04 lindenle joined #git
17:06 converge joined #git
17:06 converge joined #git
17:07 nicksloan joined #git
17:11 a_thakur joined #git
17:11 Flowinho joined #git
17:13 Khisanth joined #git
17:13 aranea I guess a minor documentation fix counts as a bugfix and should thus be based on the 'maint' branch?
17:16 cyberz hello
17:17 cyberz I'd like to reword a commit that has already been checked out (and forked to other branches) by some other people. If I do so would be hard for other developers to synchronize with the rewritten history?
17:18 vktec Yes. Don't ever amend commits you've already pushed
17:18 vktec Changing the commit message changes the hash, so it won't merge correctly
17:19 aranea If you've already merged the commit to other branches, it'd be especially messy.
17:19 vktec Even if you haven't, just don't do it
17:19 vktec :P
17:20 vktec Unless you like getting lynched by a mob of angry devs, of course
17:22 cyberz yup. I understand that would be the case if you change something, but I was wondering even I a simple reword can cause such a mess
17:22 cyberz s/I a/If a/
17:22 vktec Yes, it can and will
17:22 vktec Anything you change about a commit changes the hash
17:23 grawity there's always git-notes
17:25 nanga joined #git
17:26 nanga joined #git
17:29 nanga joined #git
17:29 zeroed joined #git
17:30 A5101 joined #git
17:30 cdg joined #git
17:31 nanga joined #git
17:31 nanga joined #git
17:32 sea-gull_ joined #git
17:34 nanga joined #git
17:34 GavinMagnus joined #git
17:35 nanga joined #git
17:35 anonymuse joined #git
17:35 nanga joined #git
17:38 converge joined #git
17:40 nidr0x joined #git
17:42 Domhack joined #git
17:42 seishun joined #git
17:44 zeroed joined #git
17:46 dreiss joined #git
17:48 hfp_work joined #git
17:48 hfp joined #git
17:54 venmx joined #git
17:54 m0viefreak joined #git
17:56 aard_ joined #git
17:57 DieguezZ joined #git
17:58 jccn joined #git
18:00 Rodya_ joined #git
18:01 courrier_ joined #git
18:01 todd_dsm joined #git
18:01 jimi_ joined #git
18:05 GavinMagnus left #git
18:07 mizu_no_oto joined #git
18:12 Starky joined #git
18:13 Siegfried joined #git
18:13 Atrumx joined #git
18:14 chrisml joined #git
18:15 mindriot101 joined #git
18:16 qassim joined #git
18:17 ochorocho__ joined #git
18:18 cyberz vktec, grawity: thanks
18:18 seishun joined #git
18:19 vuoto joined #git
18:19 git_guest joined #git
18:19 kulelu88 joined #git
18:20 git_guest I'm trying to use bundles, and I'd like all rev refs (local and remote) to be updated to match what is in the bundle. When I do simply git pull file.bundle, no refs seem to be updated
18:21 xocket left #git
18:22 donmichelangelo joined #git
18:23 grawity because that's not what `git pull` does anyway
18:23 Phylock joined #git
18:23 grawity refs are updated by `git fetch`
18:23 therealGent joined #git
18:25 git_guest I thought pull did fetch and more?
18:28 git_guest grawity: just tried it, and git fetch file.bundle doesn't update (for ex) refs/remotes/origin/master
18:28 grawity oh, right
18:28 grawity the problem is different then
18:28 grawity the problem is that file.bundle is not 'origin'
18:28 vuoto joined #git
18:29 elsevero joined #git
18:29 grawity refs/remotes/origin is only updated when you fetch from origin
18:29 zeroed joined #git
18:30 _ikke_ Can you point a remote to a bundle?
18:30 spacelord joined #git
18:30 git_guest ok, so I have a machine that I'll only be updating via bundles, but I'd like the refs to match the 'real' repo. Is there a way I can acomplish that?
18:31 _ikke_ git_guest: The answer to my question would answer that
18:31 grawity assuming the default refspec in remote.origin.fetch, `git fetch foo.bundle refs/heads/*:refs/remotes/origin/*` would probably work
18:31 grawity alternatively, git -c remote.origin.url=foo.bundle fetch origin
18:32 git_guest the bundles will only have updates from the last transferred rev up to the latest (ie incremental updates of the repo using bundles). Would that cause any problems when changing origin to the latest incremental bundle each time?
18:33 raspado joined #git
18:38 git_guest grawity: thanks, mapping the refs did the job
18:40 shgysk8zer0 joined #git
18:42 anonymuse joined #git
18:44 Siegfried joined #git
18:45 nidr0x joined #git
18:45 mindriot_ joined #git
18:46 Rickmasta joined #git
18:47 unity32d joined #git
18:48 robotroll joined #git
18:49 mindriot101 joined #git
18:50 inflames joined #git
18:51 nicksloan joined #git
18:52 overlord_tm joined #git
18:55 jozwior joined #git
18:55 cagedwisdom joined #git
18:56 Camusensei left #git
18:57 Starky joined #git
18:58 harnold joined #git
19:00 mindriot101 joined #git
19:00 stalk joined #git
19:00 stalk hello
19:01 Rodya_ joined #git
19:01 _ikke_ hai
19:01 jmpp__ joined #git
19:01 stalk Say I have a remote, and my local repo, and I want to pull/push with the remote being the "master"; that is, everytime their is a conflict on pull, the version of the master is taken. So the conflict should be resolved
19:02 stalk So, the command to pull is `git pull -srecursive -Xtheirs`, and to push is just `git push`
19:03 stalk Is that reasonable?
19:03 ahmedelgabri joined #git
19:03 anonymuse joined #git
19:03 _ikke_ -srecursive is redundant, but this should work
19:04 stalk ah, because -recursive is the default option
19:06 stalk and what would the symmetrical be ? ie the local is the master? `pull  -Xours` and `push --force` ?
19:06 _ikke_ --force would not be necessary
19:06 stalk why?
19:07 _ikke_ Because you are not rewriting history
19:07 stalk I mean, if I just push and there is a conflict, it will abort, won't it?
19:08 JanC joined #git
19:09 _ikke_ pushing never merged, so it cannot conflict. If it's rejected, it's not because of conflicts, but because the remote has commits you don't have locally
19:09 _ikke_ if you would force push, you would overwrite those commits
19:09 _ikke_ stalk: merging always happens locally
19:11 stalk What I want is to have two repos, and one mirrors the other, and modifications that are not made in the master are accepted *if* they don't cause a problem; Also, I shouldn't have to resolve things by hand. I could just do the pulls/pushs blindly and know that git follows this "procedure"
19:11 InfoTest joined #git
19:12 stalk So, in the "local is master" mode, I should first `pull -Xours`, then push ?
19:12 NwS joined #git
19:13 rwb joined #git
19:16 elsevero joined #git
19:21 elsevero_ joined #git
19:21 CrazyBonz joined #git
19:22 rorro joined #git
19:22 hahuang65 joined #git
19:25 zeroed joined #git
19:25 jstein_ joined #git
19:26 qassim joined #git
19:26 meth joined #git
19:29 qassim joined #git
19:31 Sasazuka joined #git
19:31 eivarv joined #git
19:32 felixjet joined #git
19:36 mischat_ joined #git
19:42 darkbit joined #git
19:43 qws-user-1228 joined #git
19:44 buffal0 joined #git
19:45 harnold joined #git
19:47 agileadam joined #git
19:49 zeroed joined #git
19:50 multi_io joined #git
19:50 qassim joined #git
19:51 cdown joined #git
19:55 BrianBlaze420 joined #git
19:55 zeroed joined #git
19:56 Rodya_ joined #git
19:56 Achylles joined #git
19:58 Domhack joined #git
20:02 qassim joined #git
20:06 zeroed joined #git
20:12 Siegfried joined #git
20:13 Mixologic_ joined #git
20:13 Doginal joined #git
20:13 seishun joined #git
20:14 Doginal left #git
20:14 Doginal joined #git
20:17 ahmed_elgabri joined #git
20:19 zeroed joined #git
20:19 zeroed joined #git
20:19 mizu_no_oto joined #git
20:21 sangy joined #git
20:24 hhee guys, which lightweight web client i can use wiht git on my own quite small server? i know that gitlab needs much resources, like cpu and mem
20:24 hhee for small team, with basic functions
20:24 tang^ joined #git
20:24 nicksloan joined #git
20:25 BrianBlaze420 joined #git
20:25 _ikke_ No experience, but either cgit, gitweb or gogs perha[s?
20:26 b100s joined #git
20:27 inflames joined #git
20:33 buzzLightBeer joined #git
20:34 moritz or use something hosted
20:36 hhee _ikke_, got it. gitweb not bad
20:37 hhee moritz, need something local, selt hosted
20:37 hhee self*
20:38 SenpaiSilver joined #git
20:42 hhee also guys.
20:43 hhee how can i view branches tree in cli?
20:43 hhee like terminal graphs.. or so on. just started work with git
20:44 moritz git log --online --decorate --graph
20:44 hhee moritz, thx a lot
20:44 moritz possibly with --all added
20:44 hhee moritz, give me - fatal: unrecognized argument: --online
20:45 hhee 2.7.4 version
20:45 moritz hhee: ssory, --oneline
20:46 hhee moritz, got it.
20:46 SenpaiSilver joined #git
20:46 systemovich joined #git
20:48 Mannn joined #git
20:49 anonymuse joined #git
20:51 Sasazuka joined #git
20:52 Blendify joined #git
20:52 jccn joined #git
20:55 Blendify how do I diff one new file?
20:55 dfaught joined #git
20:58 Rodya_ joined #git
21:00 dfaught joined #git
21:00 cheater joined #git
21:00 Darren_ joined #git
21:01 cdg joined #git
21:04 cdg joined #git
21:04 cheater left #git
21:05 raisen joined #git
21:08 dendazen joined #git
21:08 Starky joined #git
21:08 sunri5e joined #git
21:10 tvw joined #git
21:10 Milos joined #git
21:14 nicksloan joined #git
21:18 eivarv joined #git
21:19 PCatinean hey guys
21:19 PCatinean I want to take changed form a separate branch, bit by bit and integrate them in another branch
21:19 PCatinean without commiting
21:19 PCatinean I want to commit ammend
21:20 OKS joined #git
21:20 vrlx joined #git
21:24 hahuang65 joined #git
21:25 rafalcpp joined #git
21:26 zeroed joined #git
21:29 moritz PCatinean: it sounds like you want to cherry-pick with --no-commit
21:29 PCatinean moritz, unfortunately there's jsut one commit there
21:29 PCatinean so I reset to the other branch adn add -p
21:34 mizu_no_oto joined #git
21:37 Blendify left #git
21:43 Remramm joined #git
21:43 Remramm joined #git
21:46 OKS left #git
21:52 nikivi joined #git
21:53 wcpan joined #git
21:53 venmx joined #git
21:53 DieguezZ joined #git
21:54 Karazhan joined #git
21:56 vktec Is there an option for git diff that will make it include the full content of the file, including lines that haven't been changed?
21:57 satifant joined #git
21:58 bmahe joined #git
21:59 boombatower joined #git
22:01 mellernoia joined #git
22:07 Karazhan joined #git
22:09 jfelchner joined #git
22:11 kaldoran joined #git
22:13 Bob8989 joined #git
22:14 zeroed joined #git
22:15 venmx joined #git
22:16 Impaloo joined #git
22:17 eivarv joined #git
22:19 PCatinean omg this is a pain
22:21 git_guest joined #git
22:21 theskillwithin joined #git
22:21 mindriot101 joined #git
22:22 ResidentBiscuit joined #git
22:26 brent__ joined #git
22:27 mizu_no_oto joined #git
22:33 Milos joined #git
22:33 shams joined #git
22:33 jimi_ joined #git
22:36 cbreak vktec: set the context very big? :)
22:36 vktec cbreak: Solved another way, but thanks
22:37 PCatinean What if I commited something and I want to ammend a commit before that one?
22:38 cbreak PCatinean: git rebase -i
22:39 cyan__ joined #git
22:39 Guest90367 left #git
22:43 PCatinean hmm, how?
22:43 venmx joined #git
22:44 PCatinean I mean I want to go back one commit, ammend and then add it back on top
22:44 mmlb joined #git
22:44 nikivi joined #git
22:55 Achylles joined #git
22:55 kadoban joined #git
22:55 Goplat joined #git
22:55 dapadoupas joined #git
22:57 dapadoupas left #git
23:00 cbreak PCatinean: yes, do that
23:00 mmlb joined #git
23:04 jeffreylevesque joined #git
23:11 ircuse joined #git
23:16 mmlb joined #git
23:29 Darren_ joined #git
23:34 justanotheruser joined #git
23:35 skunkz joined #git
23:35 nilukush joined #git
23:38 xall joined #git
23:39 Marbug joined #git
23:41 prg3 joined #git
23:47 jfelchner joined #git
23:47 theskillwithin joined #git
23:48 chibby0ne joined #git
23:48 Starky joined #git
23:48 rebrec joined #git
23:49 Karazhan joined #git
23:50 rwb joined #git
23:52 dviola joined #git
23:54 Akardi joined #git
23:56 rebrec joined #git
23:57 gamester joined #git
23:58 _ADN_ joined #git
23:59 LBV_User joined #git

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