IRCloggy #git 2020-06-26

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.

2020-06-26

← tgunr left00:00
→ tgunr joined00:05
→ orbyt_ joined00:07
← tiin57 left00:09
← jaziz left00:09
← Lucas_Gray left00:09
→ Lucas_Gray joined00:12
→ tiin57 joined00:12
← zebrag left00:15
→ zebrag joined00:18
→ sunova joined00:19
← pinpox left00:22
← sunova left00:24
← Jackneill left00:24
→ sunova joined00:24
← _Vi left00:25
→ SwiftMatt joined00:28
← tgunr left00:28
→ tgunr joined00:32
→ Jackneill joined00:38
← tiin57 left00:39
→ Technodrome joined00:41
→ tiin57 joined00:42
← tgunr left00:44
→ sickdyd joined00:45
→ tgunr joined00:48
← Brainium left00:51
→ Goplat joined00:52
→ watabou joined00:54
→ Led_Zeppelin joined00:55
← tgunr left00:56
→ tgunr joined00:58
Led_Zeppelin is it possible to have a directory which is a submodule inside a nested directory? If I have bigrepo. I have a submodule repo called "submoduleRepo". bigrepo/dira/dirb/foo foo is where I want to keep the submodule.00:59
← exmortus left01:04
← tiin57 left01:08
← Kaivo left01:10
→ tiin57 joined01:12
← CyberShadow left01:15
→ CyberShadow joined01:16
→ fission6 joined01:21
← tgunr left01:22
← rodarmor left01:23
→ tgunr joined01:24
← dfee left01:27
← SwiftMatt left01:29
← tgunr left01:30
← fission6 left01:30
← Led_Zeppelin left01:31
← k3yp left01:35
→ k3yp- joined01:35
← florekm left01:35
→ tgunr joined01:35
← ToTheInternet left01:35
k3yp- → k3yp01:36
→ osk joined01:37
→ SwiftMatt joined01:37
← tiin57 left01:38
→ dviola joined01:40
→ tiin57 joined01:42
← osk left01:50
← davispuh left01:50
← Lucas_Gray left02:04
← tgunr left02:06
← tiin57 left02:08
← g4570n left02:10
→ tiin57 joined02:11
lagothrix → Guest5676502:12
← Guest56765 left02:12
→ lagothrix joined02:12
← lankanmon left02:12
→ tgunr joined02:14
→ lankanmon joined02:14
← crose left02:15
← Cabanossi left02:15
→ inkbottle joined02:21
→ veegee joined02:21
← zebrag left02:22
→ Cabanoss- joined02:24
← CyberShadow left02:29
→ CyberShadow joined02:30
← regedit left02:33
→ vdamewood joined02:33
→ libertyprime joined02:34
← Sasazuka left02:35
← tgunr left02:36
→ chandoo joined02:37
← mns left02:38
← tiin57 left02:38
← chachasmooth left02:39
→ mns joined02:40
→ chachasmooth joined02:40
→ stitched_unicorn joined02:41
→ tiin57 joined02:42
→ barteks2x joined02:46
← barteks2x_ left02:46
→ tgunr joined02:47
← darkstardev13 left02:51
← orbyt_ left02:53
← FFY00 left02:54
← nvmd left02:54
→ FFY00 joined02:54
← chandoo left02:56
← barteks2x left02:56
← tgunr left02:57
→ barteks2x joined02:57
← barteks2x left02:58
← dtrainor left03:01
← deepy left03:01
→ deepy joined03:02
← veremitz left03:02
← shush left03:07
← tiin57 left03:08
→ veremitz joined03:09
← SwiftMatt left03:10
→ tiin57 joined03:12
← foul_owl left03:15
→ SwiftMatt joined03:16
→ tgunr joined03:16
← vdamewood left03:17
← CyberShadow left03:18
→ darkstardev13 joined03:26
← tgunr left03:27
← SwiftMatt left03:28
→ dfee joined03:28
→ Newami joined03:28
→ foul_owl joined03:29
← wymillerlinux left03:30
→ orbyt_ joined03:32
→ tgunr joined03:32
→ CyberShadow joined03:33
← Cabanoss- left03:33
← Newami left03:34
← orbyt_ left03:35
→ gxt__ joined03:36
← tgunr left03:37
→ Cabanossi joined03:38
→ nly joined03:38
← tiin57 left03:38
← gxt_ left03:39
← causasui left03:41
→ tiin57 joined03:42
→ tgunr joined03:51
← dfee left04:00
→ SwiftMatt joined04:01
← tgunr left04:01
→ dfee joined04:04
→ tgunr joined04:05
← tiin57 left04:08
← SwiftMatt left04:10
→ tiin57 joined04:12
→ Muimi joined04:15
→ _cipher joined04:18
← sunova left04:23
← Cabanossi left04:24
← _0xDEADBEEF left04:28
← sudoforge left04:29
← tejr left04:30
← ghost43 left04:35
→ Cabanossi joined04:35
→ ghost43 joined04:36
← tgunr left04:36
→ tgunr joined04:38
← tiin57 left04:38
→ tejr joined04:39
→ tiin57 joined04:42
→ SwiftMatt joined04:46
← SwiftMatt left04:47
→ _0xDEADBEEF joined04:48
← fuzzmz left04:52
→ fuzzmz joined04:52
← tgunr left04:52
→ tgunr joined04:53
← sickdyd left04:54
→ rustyshackleford joined04:54
→ SwiftMatt joined04:55
← _cipher left04:55
← SwiftMatt left04:55
→ _cipher joined04:56
← tgunr left04:59
← cliluw left05:00
→ tgunr joined05:07
← tiin57 left05:08
→ tiin57 joined05:12
← tgunr left05:12
→ tgunr joined05:15
← Technodrome left05:15
← bket left05:25
→ bket joined05:28
← tgunr left05:29
→ tgunr joined05:31
← tgunr left05:36
→ tgunr joined05:38
← tiin57 left05:39
→ Phylock joined05:39
→ tiin57 joined05:42
→ zebrag joined05:51
→ ferdna joined05:52
← inkbottle left05:53
→ bocaneri joined05:53
→ _Vi joined05:54
← Goplat left05:54
← Cabanossi left05:55
→ Cabanossi joined05:56
← _cipher left05:59
→ kleisli_ joined06:03
← andreas303 left06:04
→ _cipher joined06:05
← kleisli left06:06
→ andreas303 joined06:06
→ florekm joined06:08
← tiin57 left06:09
→ mightyjens joined06:10
→ tiin57 joined06:12
→ jamshoot joined06:13
jamshoot hello06:13
gitinfo jamshoot: 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.06:13
jamshoot How can i add branch from remote to local? Problem is i have only one branch localy, even after `git fetch --all`, so i cant `checkout` to it06:16
← kenwoodfox left06:17
ikke You _do_ have the branch locally :)06:17
try git branch -r06:17
→ kenwoodfox joined06:17
jamshoot ikke, i dont see needed branch after `git branch -r`06:18
but i can see it after `git ls-remote origin`06:19
*my remote is origin06:20
→ calcul0n joined06:21
ikke what does git config remote.origin.fetch return?06:21
jamshoot +refs/heads/staging:refs/remotes/origin/staging06:22
so i can see only staging branch06:22
ikke ok, so it's setup to only fetch that branch indeed06:22
jamshoot and i need to change it so something like refs/heads/*:refs/remotes/origin/* ?06:23
ikke yes06:23
jamshoot ok, thanks06:23
ikke prefix it with a '+'06:24
← caskd left06:25
← calcul0n left06:25
← ferdna left06:26
→ calcul0n joined06:27
→ st-gourichon-fid joined06:30
jamshoot ikke, all works perfectly, thanks alot, see ya06:31
→ Guest20 joined06:35
← zebrag left06:35
→ zebrag joined06:35
← thiago left06:38
← tiin57 left06:39
→ tiin57 joined06:42
← calcul0n left06:43
← Betal left06:44
← jamshoot left06:45
→ calcul0n joined06:46
← yitz left06:46
→ clime joined06:46
f8e4 is it possible to undo: git clean -dfx -e *_dev*06:49
← krueg left06:49
← calcul0n left06:50
→ muhaha joined06:51
→ calcul0n joined06:52
ikke ni06:52
no06:52
git clean is like rm06:53
← cxl left06:54
f8e4 uuh ok06:55
← mns left06:56
→ mns joined06:57
→ deathwishdave joined06:57
→ rfuentess joined07:00
→ jaziz joined07:01
→ theoceaniscool joined07:01
→ sunova joined07:02
→ KnoP joined07:03
→ bolovanos joined07:07
← sunova left07:07
← tiin57 left07:08
→ tiin57 joined07:11
→ Codaraxis__ joined07:12
← deathwishdave left07:13
→ R2robot joined07:15
← _Vi left07:15
← Codaraxis_ left07:15
← Abbott left07:18
← KnoP left07:21
→ Abbott joined07:21
← _cipher left07:22
→ KnoP joined07:22
← Trieste left07:23
→ dosmanak joined07:23
dosmanak Hello. I am dooing some large refactor and 'git add -N' does not work. Whaaat?07:23
The file is still in the 'new file:' state.07:24
→ Trieste joined07:25
→ deathwishdave joined07:26
← _0xDEADBEEF left07:26
→ _0xDEADBEEF joined07:27
← _0xDEADBEEF left07:27
→ _cipher joined07:27
← ncdulo left07:29
← bettencb left07:32
→ quetz joined07:32
← random_yanek left07:35
→ random_yanek joined07:36
← tiin57 left07:38
→ Codaraxis_ joined07:39
→ _0xDEADBEEF joined07:40
→ tiin57 joined07:42
← Codaraxis__ left07:43
→ feriman joined07:50
→ PavelB joined07:53
← mat001 left07:56
← gavlee left07:57
→ Cabanoss- joined08:02
← Cabanossi left08:03
Cabanoss- → Cabanossi08:03
← _cipher left08:04
→ NeoCron joined08:07
← deathwishdave left08:08
← tiin57 left08:08
← Cabanossi left08:10
← KnoP left08:11
→ tiin57 joined08:12
→ KnoP joined08:12
→ oxymoron93 joined08:13
→ Cabanossi joined08:14
← KnoP left08:20
→ KnoP joined08:20
← Guest20 left08:23
← stdedos left08:24
→ Atlenohen joined08:26
→ gavlee joined08:30
← bocaneri left08:31
→ ncdulo joined08:32
← fling left08:34
← dfee left08:36
← feriman left08:36
← KnoP left08:36
→ maryo_t joined08:37
→ feriman joined08:37
→ tonythomas joined08:37
← tiin57 left08:38
← maryo_s left08:40
← Cabanossi left08:42
→ tiin57 joined08:42
← Muimi left08:43
→ bocaneri joined08:43
→ Cabanossi joined08:46
→ haymawk joined08:50
← gekkou left08:50
→ KnoP joined08:54
← bolovanos left08:58
j416 dosmanak: what did you expect?09:00
dosmanak It should ne added in stage and states as modified.09:01
j416 but it's a new file, so it says new09:01
you added it.09:01
what do you want to achieve?09:02
dosmanak Oh. Perhaps I forgot how it behaves. I want to add a file only for tracking the changes, but not the content. I wanted to have only modified files unstaged, not untracked. So new file means the same like modified here.09:04
j416 I don't think -N alone will do that. Not sure if there's a quick way other than adding an empty file.09:05
← tiin57 left09:08
→ sahasatvik joined09:10
→ tiin57 joined09:12
← muhaha left09:17
← HumanGeek left09:17
→ dionysus69 joined09:18
→ aliss joined09:19
← vicfred left09:19
→ unixbhaskar joined09:20
← tgunr left09:20
→ Arc joined09:21
Arc I'm rebasing and accidentally left some files that were modified that I don't want to commit. But I can't figure out how to abandon changes to those files now and the checkout files aren't doing the right thing09:22
does anyone know how to say "GIT - listen - reset these files, ignore local file changes - just continue with the rebase"09:22
→ Guest20 joined09:22
Arc like a "git rebase --continue -f"09:22
haymawk are the files in a conflicted state?09:23
unixbhaskar git stash ...might help ..09:25
To put away the local changes for the time being use git stash09:25
Arc no I don't want to stash them09:26
← g00s left09:27
oxymoron93 rebase shouldn't have started if there were modified files. If it did, rebase process was stopped only because of emerged conflicts, which you should resolve.09:27
Arc background: the person who manages the upstream put a binary sqlite3 database into the repo. Running tests updates the database. I almost never will ever want to update that file.09:28
I abandoned the rebase, dropped the changes, and restarted it09:28
bremner maybe make the tests clean up after themselves?09:28
otherwise some of the hacks in !config may apply09:29
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 ideas09:29
Arc thanks09:29
Ideally i'd like to get that binary file out. Instead, have a script that sets up the sqlite3 database for testing upon request09:30
← dummys left09:31
← feriman left09:32
haymawk Arc: did you try 'git checkout topicbranch -- sqlite3file` to remove the changes after running the tests?09:32
Arc i wasnt allowed to do that during a rebase, but did after abandoning the rebase, and then restarted it09:33
→ tgunr joined09:34
→ HumanGeek joined09:35
← zebrag left09:35
→ zebrag joined09:35
→ caskd joined09:37
← tiin57 left09:38
← bocaneri left09:39
← lungaro left09:41
→ Lucas_Gray joined09:41
→ tiin57 joined09:42
← navidr left09:43
← ash_worksi left09:43
→ kaartic joined09:43
→ ash_worksi joined09:44
→ bocaneri joined09:51
→ AL13N_lappy joined09:57
AL13N_lappy i have big differences that i'm splitting in various commits; but now i've made a staged diff, but it appears it depends on some other changes that i haven't committed yet...09:58
how can i do some other commits first and then commit what i have now in stage?09:58
← blaisebool left09:59
→ blaisebool joined10:00
j416 AL13N_lappy: that'll be tricky; you can commit it and then try to reorder, but you'll likely end up with conflicts10:01
AL13N_lappy: if they're adjacent changes, that is. If they're not adjacent (differerent files, or different parts of a file) then committing first and then reording should work fine.10:02
AL13N_lappy: stash is another option, but I prefer committing.10:03
← jaziz left10:08
→ maryo_s joined10:08
← tiin57 left10:08
AL13N_lappy j416: i was reading into stash with --keep-index, but that seems to do the reverse of what i want; some other person said something about branches, that you can apply later, but i donno10:09
i could just commit and reorder later, but i'm thinking i'll likely forget to reorder later... :-(10:10
← maryo_s left10:10
← maryo_t left10:11
→ maryo joined10:11
j416 AL13N_lappy: why do you need to reorder later? reorder directly.10:11
→ tiin57 joined10:12
AL13N_lappy i haven't committed the earlier commits yet, so i can't order it properly now10:15
i ended with making a "commits_for_later" branch and committed it there10:16
then after i commit the rest, i can cherrypick from there back on master10:16
i think10:16
j416 don't wait for too long10:16
AL13N_lappy i have like 50 files with various changes and since project needs to be tested starting on monday, i'll need to fix all this today... :-) so...10:17
it's kinda stupid that people made on-server changes instead of regularly doing commits on master; now i have to backtrack 5months of work and try to split up properly into commits10:17
AL13N_lappy sighs10:17
← Arc left10:18
→ BPL joined10:20
← tgunr left10:21
→ Frobozz joined10:21
← PavelB left10:23
← libertyprime left10:24
← unixbhaskar left10:25
→ tgunr joined10:28
← watabou left10:32
→ snthsnth joined10:33
← tiin57 left10:38
→ tiin57 joined10:41
→ lungaro joined10:48
← caskd left10:53
→ sudomake joined10:56
← sudomake left10:56
anddam should I be getting the following notice The following paths are ignored by one of your .gitignore files: even if I am touching a file in the ignored path that is already under revision control/10:56
s,/,?,10:57
→ sudomake joined10:58
→ _cipher joined11:03
← rustyshackleford left11:04
→ mkoskar joined11:08
← UrsoBranco left11:08
← tiin57 left11:08
→ tiin57 joined11:12
← Lucas_Gray left11:14
← sudomake left11:15
→ sudomake joined11:15
→ zatumil joined11:18
← tgunr left11:18
← _cipher left11:19
← sudomake left11:22
← aliss left11:22
→ Lucas_Gray joined11:26
← xcm left11:30
→ xcm joined11:30
← darkstardev13 left11:36
→ darkstardev13 joined11:38
← tiin57 left11:38
← Guest20 left11:42
→ tiin57 joined11:42
→ bolovanos joined11:43
← xcm left11:44
→ xcm joined11:44
← bocaneri left11:47
← tonyj left11:48
← KnoP left11:52
← Serus left11:57
→ bocaneri joined11:59
→ unixbhaskar joined12:01
→ krueg joined12:03
→ Brainium joined12:04
← tejr left12:06
← kaartic left12:08
← tiin57 left12:08
→ PonySoldier joined12:11
PonySoldier if i have a branch, and don't want to merge it into master yet, is there a way of merging them to see any conflicts without merging to master?12:12
→ tiin57 joined12:12
→ raven-au_ joined12:13
← raven-au left12:13
raven-au_ → raven-au12:13
ikke Easiest is to just trying to merge it, and afterwards, undo it again12:14
PonySoldier ikke: can't i just create a "test-merge" branch, then do "git merge master, git merge branch-to-check"?12:15
ikke sure, but there is no difference12:16
PonySoldier oh, ok12:16
ikke no real difference anyway12:16
If you're more comfortable just having to delete a branch (rather than to reset it), go ahead, and do that12:17
→ raven-au_ joined12:19
← xcm left12:20
→ xcm joined12:20
PonySoldier yeah probably am12:21
thanks mate12:21
→ nvmd joined12:21
← raven-au left12:21
raven-au_ → raven-au12:21
→ kaartic joined12:27
← PonySoldier left12:30
→ benyoo joined12:30
← diogenese left12:30
→ diogenese joined12:31
→ caskd joined12:33
→ tejr joined12:34
← tiin57 left12:38
→ tiin57 joined12:41
→ jco joined12:41
jco Hey!12:42
i've worked on a feature in a separate branch while a collegue added stuff on the master branch12:42
now i'd like to incorporate those changes to my feature branch12:42
← troulouliou_div2 left12:44
jco so i did: git rebase master -i (and there was the 4 commits i added in the feature branch)12:44
saving the file i now have only the two commits from master added by my collegue12:45
i guess i needed to edit the 4 commits, i selected pick for each of them12:45
what do you think?12:45
dosmanak Why have you used the -i flag_You could just rebase and let git pick all commits from master and then replay your commits.12:46
davve yea i usually just do git rebase m aster12:47
master*12:47
dosmanak Of course there could be a conflict in which case you must resolve the conflict and rebase --continue.12:47
davve (since you want all of them)12:47
jco ah yeah he did a refactoring in one of his commits which interfere with those from the feature branch unfortunately12:49
→ maryo_s joined12:50
→ lucasb joined12:51
dosmanak Then you might ended in the middle of rebase. Don't you see it running git status?12:51
jco indeed i noticed12:51
resolved the first conflict and saved the result with git commit --amend -a12:52
i continue to the next commit12:52
dosmanak So you can continue git rebase --continue12:52
← maryo left12:53
jco yeah :)12:53
although i lost one of my commits12:54
dosmanak Well, perhaps you did not want to do --amend ;-)12:54
git status should advice you how to mark resolution.12:55
try again :-)12:55
jco hum i did it too fast, git status will help to see what's going on yep12:56
ah in the first conflict i'd like to mix both of our changes, like keeping one of both our changes12:58
so i'll need to make a new commit for that?12:58
once the conflicts are resolved12:59
→ CodeSlingerPaul joined13:00
dosmanak Their changes should stay in their commits, but you commit with conflict will be changes accordingly. I would need to see the git status message, but I thing git add <conflicted_file> && git rebase --continue should work.13:01
jco ah right13:02
i did git commit -amend -a again, merging two commits, oops :)13:03
perfect, the commits from the feature branch are added on top of the new changes from master!13:07
many thanks dosmanak and davve13:07
davve you're welcome!13:08
dosmanak I am glad I could be helpful.13:08
← tiin57 left13:08
→ cd joined13:08
→ fission6 joined13:09
→ tiin57 joined13:12
→ mat001 joined13:12
→ causasui joined13:13
← nvmd left13:14
→ nvmd joined13:18
→ Serus joined13:19
→ krueger joined13:23
← krueg left13:26
← HumanGeek left13:26
← Olipro left13:27
→ Technodrome joined13:32
← _0xDEADBEEF left13:36
→ Aquazi joined13:37
← tiin57 left13:38
→ Maxattax joined13:40
→ EmmaT joined13:41
→ HumanGeek joined13:41
→ tiin57 joined13:41
← HumanGeek left13:43
← sahasatvik left13:43
← ShapeShifter499 left13:44
→ ShapeShifter499 joined13:45
→ HumanG33k joined13:45
→ tgunr joined13:46
← HumanG33k left13:52
→ HumanG33k joined13:52
← tgunr left13:53
→ tgunr joined13:55
davve is it possible to rebase (interactively) commits made by a given user?13:56
→ neurre joined13:56
neurre how do I make git for windows mintty key repeat speed faster?13:56
https://mintty.github.io/mintty.1.html says Note that the repeat rate can be adjusted dynamically by an escape sequence.13:58
how?13:58
→ kruegr joined13:59
ikke I don't think most of us here would know14:01
this is very mintty specific14:01
→ watabou joined14:01
neurre yeah sorry, I could not figure out better place to ask :/14:02
seanBE hey all. quick question. i've got a repo on one machine running 2.25.2 and another 2.26. when I run branch --all on the older one, I see the remote branches whilst the new machine does not. Is this due to the new network protocol?14:02
→ crose joined14:02
← krueger left14:02
→ krueg joined14:03
ikke no, git branch does not work over the network14:03
← HumanG33k left14:03
← tgunr left14:03
seanBE ikke: alright my bad. I'll keep looking.14:04
ikke seanBE: if git branch --all does not show branches, it means they have not been fetched14:05
← kruegr left14:05
← watabou left14:06
← pymagic left14:08
← tiin57 left14:08
→ tgunr joined14:12
→ tiin57 joined14:12
seanBE ikke: okay thanks. I've tried fetching but no luck. I'll keep debugging. I can push and pull from the remote branch just fine. I've also somehow got a local copy of a remote branch (I didn't pull this down)14:13
← krueg left14:13
seanBE ikke: the only thing I changed was remote protocol to ssh. I'll keep looking :)14:13
← dosmanak left14:15
← mightyjens left14:15
← kleisli_ left14:16
ikke What is the output of remote.<remotename>.fetch?14:18
seanBE ikke: alright so initially I changed a remote url from http to ssh. Now I've just renamed and created a new one (origin => old, new origin). now it works...14:18
← jco left14:18
← dedowsdi left14:20
seanBE ikke: I should have pasted this earlier but the output was just ` * branch HEAD -> FETCH_HEAD`14:20
thanks for your time by the way*14:21
← Hello71 left14:23
→ Hello71 joined14:24
← unixbhaskar left14:24
→ thiago joined14:28
← irrgit left14:34
← tgunr left14:36
→ irrgit joined14:37
← tiin57 left14:38
→ tgunr joined14:39
→ orbyt_ joined14:40
→ tiin57 joined14:41
← tgunr left14:44
← fission6 left14:44
← rfuentess left14:44
→ tgunr joined14:45
← yuriii left14:48
← NeoCron left14:49
← tgunr left14:49
→ Noldorin joined14:50
→ fission6 joined14:52
← xcm left14:52
→ xcm joined14:53
→ tgunr joined14:53
← theoceaniscool left14:59
← tgunr left14:59
→ tgunr joined15:00
← kaartic left15:00
→ kleisli_ joined15:02
benyoo sometimes I lock my keyboard in git bash that I can't type anymore.15:06
ctrl + s is it I guess, how I can unlock it?15:07
← tgunr left15:07
cdunklau benyoo: ctrl + q iirc15:07
benyoo: https://unix.stackexchange.com/questions/137842/what-is-the-point-of-ctrl-s15:08
benyoo I thought it too, but did not work. normally it works.15:08
← tiin57 left15:08
→ tgunr joined15:08
benyoo ok in bit bash it was not ctr + s, then I locked it a diffreny way %%15:10
^^15:10
→ sudoforge joined15:11
→ tiin57 joined15:11
← tgunr left15:15
→ iNCoNFuN joined15:15
→ tgunr joined15:15
→ workfrosty joined15:17
← tgunr left15:22
← Noldorin left15:23
→ tgunr joined15:24
→ rafasc joined15:26
→ sahasatvik joined15:29
← sahasatvik left15:31
← tgunr left15:33
← Cabanossi left15:33
→ tgunr joined15:34
← nly left15:35
← tgunr left15:36
← tiin57 left15:38
← rafasc left15:38
→ g4570n joined15:40
→ rafasc joined15:40
→ tiin57 joined15:42
← dionysus69 left15:42
← oxymoron93 left15:44
→ geowiesnot joined15:47
→ Cabanossi joined15:47
← Technodrome left15:49
→ tonyj joined15:50
← Phylock left15:53
← bocaneri left15:55
→ Noldorin joined16:06
→ Guest20 joined16:07
→ bettencb joined16:07
→ bocaneri joined16:08
← Noldorin left16:08
← tiin57 left16:08
→ tiin57 joined16:11
← iNCoNFuN left16:18
→ dionysus69 joined16:20
← T_UNIX left16:22
finn[m] What's the difference between `git reset fileA` and `git reset HEAD -- fileA`?16:24
→ dfee joined16:24
→ osse joined16:24
ikke nothing16:25
finn[m] I think both do same thing, remove changes of fileA from staging area.16:25
ikke HEAD is the default16:25
→ orbyt_v7 joined16:25
→ sudomake joined16:26
→ Brain joined16:27
← geowiesnot left16:28
← Lucas_Gray left16:28
→ cdown_ joined16:29
← wrksx_ left16:30
→ Noldorin joined16:30
← [Brain] left16:30
→ theoceaniscool joined16:30
→ geowiesnot joined16:31
finn[m] I want to define an 'unstage' alias, for that latter format would be good choice because latter always expects a filename. Isn't?16:31
← bocaneri left16:31
→ freddieptf joined16:31
← cdown left16:31
cdown_ → cdown16:31
→ Betal joined16:34
→ wrksx joined16:35
finn[m] ikke: Okay, thanks.16:35
← geowiesnot left16:38
← tiin57 left16:38
→ tiin57 joined16:41
→ _cipher joined16:42
→ bocaneri joined16:44
rafasc finn[m]: you can also use the new "git restore --staged", i.e. alias.unstage="restore --staged"16:47
← sudomake left16:50
→ sudomake joined16:50
→ AtumT joined16:50
← fission6 left16:53
← justan0theruser left16:53
← lankanmon left16:54
→ lankanmon joined16:54
← cyphase left16:54
→ cyphase joined16:58
← stitched_unicorn left17:02
→ feriman joined17:05
→ wootehfoot joined17:07
← tiin57 left17:08
← duderonomy left17:09
← Noldorin left17:10
← dionysus69 left17:10
→ tiin57 joined17:11
→ HumanG33k joined17:12
← sudomake left17:12
→ sudomake joined17:13
← SpeakerToMeat left17:15
→ SpeakerToMeat joined17:16
→ Anticom joined17:17
→ justan0theruser joined17:18
← HumanG33k left17:19
→ stitched_unicorn joined17:20
← stitched_unicorn left17:20
→ fling joined17:24
← Guest20 left17:25
→ m0viefreak joined17:26
→ fission6 joined17:32
neurre when I try to push, I get ! [remote rejected] windows-fix -> windows-fix (shallow update not allowed)17:34
→ karstensrage joined17:34
neurre what does that mean and how do I fix that?17:34
I am trying to make a PR to a fork in github17:34
← sudomake left17:35
→ sudomake joined17:35
← workfrosty left17:35
→ HumanG33k joined17:35
neurre oh, git fetch --unshallow fixed it17:36
← tiin57 left17:38
→ tiin57 joined17:41
→ onizu joined17:43
← neurre left17:44
← fission6 left17:49
→ fission6 joined17:52
→ sudomaker joined17:52
← sudomake left17:53
← JanC left17:53
→ JanC joined17:54
→ davispuh joined17:55
← lacrymology left17:56
→ kleisli__ joined17:58
← dfee left17:58
← kleisli_ left18:00
→ Cabanoss- joined18:02
← cd left18:03
→ dfee joined18:03
← Cabanossi left18:03
Cabanoss- → Cabanossi18:03
← Xiti left18:05
→ ams___ joined18:06
← tonythomas left18:06
→ irrgit_1 joined18:07
← irrgit left18:07
← tiin57 left18:08
← freddieptf left18:11
← irrgit_1 left18:11
→ irrgit joined18:11
→ tiin57 joined18:12
← cluelessperson_ left18:12
finn[m] rafasc: Thanks.18:13
→ cluelessperson joined18:13
→ jamiejackson joined18:13
→ Xiti joined18:18
→ vicfred joined18:26
← bocaneri left18:30
← jaywok left18:38
← fission6 left18:38
← tiin57 left18:38
← Cabanossi left18:40
← clime left18:41
→ tiin57 joined18:41
← kleisli__ left18:43
→ Cabanoss- joined18:44
Cabanoss- → Cabanossi18:45
← led_belly left18:53
→ freddieptf joined18:55
→ SwiftMatt joined18:59
→ cliluw joined19:03
← xcm left19:06
→ xcm joined19:06
← bolovanos left19:07
← tiin57 left19:08
→ tiin57 joined19:11
→ jwest joined19:11
→ watabou joined19:12
→ geowiesnot joined19:13
← SwiftMatt left19:14
→ tgunr joined19:16
→ fission6 joined19:20
← geowiesnot left19:23
← davispuh left19:24
→ SwiftMatt joined19:24
→ led_belly joined19:25
← orbyt_v7 left19:25
← orbyt_ left19:25
← fission6 left19:25
← cyphase left19:25
→ davispuh joined19:27
→ Sasazuka joined19:30
→ voidSurfr joined19:30
← dmc left19:35
→ dmc joined19:35
→ cyphase joined19:37
← cliluw left19:38
← tiin57 left19:38
→ tiin57 joined19:42
← davispuh left19:48
← cyphase left19:51
→ davispuh joined19:52
← maryo_s left19:55
← Maxattax left19:56
← lankanmon left19:59
← sudomaker left19:59
← osse left19:59
→ lankanmon joined20:00
← jwest left20:00
← S0l4rb03 left20:02
→ fission6 joined20:03
→ jwest joined20:03
→ cliluw joined20:07
→ cyphase joined20:07
← tiin57 left20:08
→ tiin57 joined20:11
← davispuh left20:12
← wootehfoot left20:13
→ matsaman joined20:13
← matsaman left20:14
→ davispuh joined20:16
→ orbyt_v7 joined20:17
← voidSurfr left20:19
→ psprint joined20:22
psprint Hi. How to provide a commit message AND AT THE SAME TIME look at the changes via the -v `commit' option?20:23
git wants to proceed with the commit if the message is given via -m or -F, and it aborts it when via -t and not edited/modified20:24
ikke psprint: add -e20:24
(--edit)20:24
→ sbeyer joined20:25
→ teej joined20:26
psprint ikke: it worked, thanks20:27
I now have an useful alias: crdme = !git commit -e -m README.md -v README.md && git p20:28
p -> push20:28
← freddieptf left20:30
← justan0theruser left20:34
→ justanotheruser joined20:35
→ g00s joined20:35
← SwiftMatt left20:35
← theoceaniscool left20:38
← tiin57 left20:38
g00s hi, if i do git stash -u .. i noticed when I try to apply it again, it won't overwrite one file that is different. is there any way to force that ?20:40
→ thebope joined20:40
→ tiin57 joined20:42
← psprint left20:42
→ voidSurfr joined20:45
← tgunr left20:46
→ tgunr joined20:49
← feriman left20:49
→ mowcat joined20:54
← tgunr left20:55
← cliluw left21:01
→ blahboybaz joined21:02
blahboybaz I guess reflog does not show all git commands that were executed? The last git command I ran was git branch -d mybranch ( successfully deleting mybranch ). However, when immediately running git reflog after that there is not a record of that branch being deleted. Only the command just prior to that. Am I reading it wrong or does reflog really not record some things?21:03
ikke blahboybaz: it's a 'ref' log21:03
it records updates to refs21:04
But because you delete a branch , the reflog for that branch is deleted as well21:04
and because HEAD is not changed, it would not contain any reference as well21:04
it's not a general command log21:04
blahboybaz ikke: That only has heads and tags in it21:05
So I guess it would record tags (if I had any) ?21:05
→ cliluw joined21:05
→ tgunr joined21:06
ikke Not sure what you are referring to21:06
→ wymillerlinux joined21:07
→ jaziz joined21:08
← tiin57 left21:08
← tgunr left21:10
→ tiin57 joined21:12
→ tgunr joined21:13
blahboybaz ikke: in the .git/refs directory there are two subdirectories named 'heads' and 'tags' . At that time I had no tags in the repo; but, seeing those two dirs inside the 'refs' directory; and, considering your post, I guessed that reflog would show things done with tags (maybe creation / deletion). I went ahead and created an annotated tag (which I can now see in .git/refs/tags). However, reflog does not record the tag begin created.21:14
I thought you were referring to reflog reading from the contents or .git/refs when you said "it records updates to refs". Did you mean something else?21:14
"tags" is also in .git/refs21:15
→ shush joined21:16
blahboybaz Oh, I guess also I was considering what I see IS in reflog which does show when HEAD is moved by recording when you switch from one branch to another. That combined with the fact that "heads" is in .git/refs made me think that since "tags" is also in .git/refs that reflog would also show stuff you do with tags21:16
→ SwiftMatt joined21:18
ikke .git/refs is not the relfog21:18
reflog21:18
← tgunr left21:19
ikke that's where the actual refs are stored (when the are unpacked)21:19
→ duderonomy joined21:19
ikke the reflog is located in .git/logs21:19
blahboybaz oh wow21:19
I hadn't noticed that dir. thanks21:20
→ fstd_ joined21:20
← voidSurfr left21:21
← lagothrix left21:21
→ lagothrix joined21:21
← Anticom left21:23
→ tgunr joined21:24
← fstd left21:24
fstd_ → fstd21:24
← foul_owl left21:25
← duderonomy left21:26
← dfee left21:26
→ duderonomy joined21:30
← fission6 left21:31
→ jetchisel joined21:32
→ dfee joined21:33
← st-gourichon-fid left21:33
blahboybaz I see git shell but it looks like its for server side only. Plus, I'm not sure every git command can be exucuted in it? I may not be using the right terminology but does there exist a login shell for git like there is for mysql? For example: running mysql -u root -p allows you to enter a password --> the result is an interactive environment where mysql commands can be run until you choose to exit.21:34
Doesn't git have something like that or is there some third party application which provides it. I mean provides it for local use also21:35
ikke well, the terminal is basically already that :)21:35
but I'm not aware of any dedicated git repl21:35
blahboybaz ikke: is that the term for it? "repl" ?21:36
or is that an abbreviation?21:36
ikke it's an abbreviation21:36
blahboybaz thanks21:37
ikke Read-Evaluate-Print-Loop21:37
← tiin57 left21:38
← quetz left21:39
→ foul_owl joined21:39
→ theoceaniscool joined21:40
davve aka interpreter, shell21:40
ikke an interpreter is not necessarily a REPL though :)21:41
→ sudomaker joined21:41
→ tiin57 joined21:41
→ riposte joined21:41
mackerman Neither is a shell, such as with graphical interfaces21:42
← tgunr left21:42
davve ah I thought all of em were. atleast ones I've used21:42
← dfee left21:43
← theoceaniscool left21:44
davve mackerman: good point21:44
cli shells would be considered repl21:45
← jwest left21:47
→ jwest joined21:47
→ tgunr joined21:49
← sudomaker left21:52
→ kleisli__ joined21:54
→ sudomake joined21:55
← sudomake left21:58
→ fission6 joined21:59
← _cipher left22:01
→ _cipher joined22:03
← calcul0n left22:06
← tiin57 left22:08
← orbyt_v7 left22:09
→ orbyt_ joined22:10
← _cipher left22:12
→ tiin57 joined22:12
→ _cipher joined22:12
← CodeSlingerPaul left22:15
← tgunr left22:16
← riposte left22:16
← justanotheruser left22:17
← duderonomy left22:18
← mooasaurus left22:18
→ tgunr joined22:18
← Spr0cket left22:19
← stux|RC left22:19
→ Spr0cket joined22:19
← HumanG33k left22:20
← BPL left22:22
← fission6 left22:24
← Atlenohen left22:26
→ Atlenohen joined22:26
→ dfee joined22:27
← jaziz left22:27
← Spr0cket left22:30
← tgunr left22:32
→ justanotheruser joined22:33
→ [Brain] joined22:34
← sbeyer left22:36
← nvmd left22:36
← Brain left22:36
← tiin57 left22:38
→ tgunr joined22:39
→ HumanG33k joined22:40
← HumanG33k left22:40
← LionsMane left22:40
→ cr4y1 joined22:41
→ HumanG33k joined22:41
← jwest left22:41
→ tiin57 joined22:41
→ riposte joined22:43
← tgunr left22:46
← Betal left22:47
→ emmanuelux joined22:49
→ saveNexist joined22:49
← saveNexist left22:49
→ saveNexit joined22:49
→ tgunr joined22:50
← cr4y1 left22:51
← Atlenohen left22:53
← AtumT left22:54
← benyoo left22:55
→ Atlenohen joined22:55
← tgunr left22:57
← Aquazi left22:58
→ _0xDEADBEEF joined23:00
← Hello71 left23:00
→ Hello71 joined23:01
← SwiftMatt left23:03
← Case_Of left23:03
→ Case_Of joined23:04
← HumanG33k left23:05
→ Spr0cket joined23:06
→ stux|RC joined23:06
← onizu left23:07
→ SwiftMatt joined23:07
→ HumanG33k joined23:07
← foul_owl left23:08
← HumanG33k left23:08
← tiin57 left23:08
← rafasc left23:08
→ HumanG33k joined23:08
→ tiin57 joined23:11
← saveNexit left23:12
→ saveNexit joined23:12
→ tgunr joined23:12
← xcm left23:15
→ xcm joined23:16
← tgunr left23:21
→ foul_owl joined23:22
← Trieste left23:23
→ tgunr joined23:26
→ Trieste joined23:26
← andy25225 left23:29
→ andy25225 joined23:29
← jzeus left23:32
→ fission6 joined23:33
← saveNexit left23:34
← _cipher left23:35
→ saveNexit joined23:35
→ _cipher joined23:36
→ otisolsen70__ joined23:37
→ Brain joined23:37
← tgunr left23:38
← tiin57 left23:38
→ mooasaurus joined23:38
← otisolsen70_ left23:40
← SwiftMatt left23:40
← _cipher left23:40
← fission6 left23:40
← [Brain] left23:40
→ tiin57 joined23:42
← jamiejackson left23:42
← HumanG33k left23:43
← SpeakerToMeat left23:44
→ [Brain] joined23:44
→ _cipher joined23:44
→ SpeakerToMeat joined23:45
→ jwest joined23:45
→ wootehfoot joined23:45
← Brain left23:46
← g00s left23:49
→ tgunr joined23:49
← n000g left23:50
← thansen left23:51
→ n000g joined23:52
→ thansen joined23:52
← foul_owl left23:54
→ HumanG33k joined23:54
→ Maxattax joined23:55
← tgunr left23:55
← HumanG33k left23:56
→ HumanG33k joined23:56
← saveNexit left23:57
→ Ignacy joined23:57
→ saveNexit joined23:57

Logs Search ←Prev date Next date→ Channels Documentation