IRCloggy #git 2020-09-25

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-09-25

← DiffieHellman left00:00
→ DiffieHellman joined00:00
← benfelin left00:01
→ mckendricks joined00:01
→ AnAverageHuman joined00:08
→ fuzzface joined00:13
← silverwhitefish left00:17
→ vngx joined00:24
→ sdwrage joined00:26
→ tilpner_ joined00:26
→ mud joined00:27
← impermanence left00:28
← tilpner left00:29
tilpner_ → tilpner00:29
← fuzzface left00:30
← mckendricks left00:30
← donofrio left00:36
→ macrover joined00:47
→ emdev joined00:48
← Noldorin left00:50
← swimmer left00:55
← cuppajoeman left00:59
hays → s_01:00
← mowcat left01:02
← budonyc left01:04
← Lucas_Gray left01:05
← macrover left01:06
← lungaro left01:07
→ lungaro joined01:08
→ Moistmelon joined01:08
← mirrorbird left01:08
← shailangsa left01:09
→ shailangsa joined01:09
← shailangsa left01:09
→ shailangsa joined01:10
← shailangsa left01:10
← Wetmelon left01:10
← tafa2 left01:13
→ swimmer joined01:14
→ totallynotnate joined01:17
← kyshoc left01:18
← F0rTex left01:18
→ kyshoc joined01:18
→ F0rTex joined01:19
← raymond left01:19
→ raymond joined01:22
← totallynotnate left01:28
← relipse left01:29
← steven left01:33
→ totallynotnate joined01:34
→ steven joined01:34
← lungaro left01:37
→ lungaro joined01:37
← dfee left01:44
→ mat001_ joined01:45
← init left01:45
→ mat001__ joined01:46
→ Newami joined01:46
→ dfee joined01:46
← davispuh left01:49
← emdev left01:49
← mat001 left01:49
← mat001_ left01:49
← Newami left01:50
← swimmer left01:59
→ mat001 joined02:01
← maxzor left02:04
← mat001__ left02:05
cdunklau austin987: erm two step it?02:08
austin987: git add -p02:08
austin987: maaaaybe the diff.context config thing, but i dunno if that works with git add02:09
→ saiba_suika joined02:10
← totallynotnate left02:10
← pac1 left02:11
→ fstd_ joined02:12
← fstd left02:16
fstd_ → fstd02:16
→ totallynotnate joined02:17
→ Sazhen86 joined02:17
← lagothrix left02:28
→ lagothrix joined02:28
→ swimmer joined02:29
→ shailangsa joined02:29
← Xiti left02:32
← NeoCron left02:33
← vngx left02:33
→ Xiti joined02:38
← justanotheruser left02:39
← opal left02:47
← dfee left02:48
← Sazhen86 left02:48
← s2013 left02:48
← Cabanossi left02:49
→ Sazhen86 joined02:50
→ Cabanossi joined02:51
→ dfee joined02:52
← smitop left02:53
← cosimone left02:55
→ init joined03:00
→ dfee_ joined03:01
← dfee left03:02
← gschanuel left03:05
← totallynotnate left03:05
→ gschanuel joined03:06
→ mirrorbird joined03:12
← pikapika left03:13
← POQDavid left03:13
← thiago left03:13
→ pikapika joined03:13
→ POQDavid joined03:14
← acetakwas left03:14
→ thiago joined03:14
← POQDavid left03:15
← pikapika left03:15
← nikivi left03:15
→ justanotheruser joined03:15
→ nikivi joined03:16
→ pikapika joined03:17
→ POQDavid joined03:17
← nikivi left03:17
→ acetakwas joined03:17
→ Goplat joined03:17
← acetakwas left03:18
→ nikivi joined03:18
← POQDavid left03:18
← pikapika left03:18
← dfee_ left03:18
← nikivi left03:19
→ pikapika joined03:20
← pikapika left03:20
→ pikapika joined03:21
→ acetakwas joined03:21
← fossegrim left03:22
← acetakwas left03:22
→ dfee joined03:22
← pikapika left03:22
→ acetakwas joined03:25
← storrgie left03:26
← matheustavares left03:26
→ storrgie joined03:27
← acetakwas left03:27
← mirrorbird left03:28
→ matheustavares joined03:28
← Sazhen86 left03:29
← leonardus left03:31
→ acetakwas joined03:33
→ Sazhen86 joined03:34
→ justan0theruser joined03:34
← justanotheruser left03:36
← Sazhen86 left03:46
→ Guest20 joined03:50
→ Sazhen86 joined03:53
→ Lucas_Gray joined03:57
← AnAverageHuman left04:00
← arcatech left04:01
← stats4647 left04:10
← Xiti left04:11
→ Xiti joined04:11
→ stats4647 joined04:11
← stats4647 left04:16
← meropyri left04:19
← sdwrage left04:21
← Xiti left04:22
→ Xiti joined04:22
← vicfred left04:23
→ meropyri joined04:24
← meropyri left04:25
→ stats4647 joined04:25
← DiffieHellman left04:28
→ DiffieHellman joined04:28
← thomasross left04:30
← stats4647 left04:30
→ meropyri joined04:32
← ninjin_ left04:33
→ ninjin_ joined04:36
→ buckworst joined04:39
← Sazhen86 left04:40
← buckworst left04:51
→ arcatech joined04:53
← arcatech left04:58
← Beta left05:02
→ karab44 joined05:02
→ stats4647 joined05:05
← mns left05:10
→ mns joined05:13
→ irc_user joined05:22
← cation21 left05:26
→ bocaneri joined05:34
← karab44 left05:36
FH_thecat my git repository starts at "/" of my filesystem05:41
I can do "git ls-files /" to list all tracked files05:42
but this does not work when I am on another filesystem (ie, in /tmp)05:42
how can I list all tracked files in /, regardles where I am currently ?05:42
Jookia FH_thecat: git -C / ls-files /05:43
→ mightyjens joined05:43
FH_thecat Jookia: perfect! thanks05:44
← thiago left05:45
← polyrob left05:46
→ polyrob_ joined05:46
polyrob_ → polyrob05:46
→ theoceaniscool joined05:46
FH_thecat and can I tell git to print absolute paths when using ls-files ?05:47
to print /etc/foo instead of etc/foo05:47
← oatmealraisin left05:51
← mattmurr left05:52
← justan0theruser left05:55
→ supercoven joined05:56
← supercoven left05:58
→ dqx_ joined06:02
→ konrados joined06:02
→ fibo_mach joined06:10
← stats4647 left06:13
→ mat001_ joined06:14
← mat001 left06:16
→ benfelin joined06:17
→ saiba_suika2 joined06:20
← saiba_suika2 left06:20
← saiba_suika left06:23
← OnkelBlade left06:31
← F0rTex left06:32
→ ferdna joined06:39
→ rfuentess joined06:39
osse you can also use --full-name instead of -C06:40
as for absolute paths, I can't find anything06:41
← theoceaniscool left06:44
→ Anticom joined06:47
← Lucas_Gray left06:47
← hussam left06:54
← unluckyshrubbery left07:02
→ mat001 joined07:04
→ karab44 joined07:07
← mat001_ left07:07
→ cdown joined07:09
← ferdna left07:15
→ POQDavid joined07:19
→ nikivi joined07:19
→ pikapika joined07:23
→ KnoP joined07:24
← gschanuel left07:26
→ gschanuel joined07:27
← cdown left07:30
→ mirrorbird joined07:31
← random_yanek left07:31
→ Darcidride joined07:33
← mir100 left07:34
→ mir100 joined07:36
→ oxymoron93 joined07:37
→ feriman joined07:40
→ vicfred joined07:40
→ zumba_addict joined07:41
→ random_yanek joined07:43
→ tarkus joined07:44
← zumba_addict left07:46
← init left07:46
→ Mattiaslndstrm joined07:47
→ chele joined07:48
← irc_user left07:51
→ PJBoy joined07:51
→ wrobinson joined07:51
← mirrorbird left07:52
← mightyjens left07:53
→ TomyWork joined07:54
← wrobinso1 left07:54
→ Muimi joined07:56
← clime left07:58
← wrksx_ left08:03
→ wrksx joined08:05
← karab44 left08:08
→ a-l-e joined08:11
→ hussam joined08:13
← Mattiaslndstrm left08:14
→ init joined08:17
← init left08:21
→ unluckyshrubbery joined08:33
→ raven-au_ joined08:33
← raven-au left08:33
raven-au_ → raven-au08:33
→ calcul0n joined08:47
← ghost43 left08:48
→ mozgalom joined08:48
→ ghost43 joined08:48
→ cdown joined08:53
→ cosimone joined08:55
← Guest20 left08:56
← mir100 left09:00
→ GankMove joined09:03
→ Lucas_Gray joined09:11
← Goplat left09:11
→ cdown_ joined09:14
← cosimone left09:16
→ cosimone joined09:16
← cdown left09:17
← steven left09:18
← cdown_ left09:19
→ steven joined09:20
← benfelin left09:23
→ fossegrim joined09:25
← mozgalom left09:30
← austin987 left09:31
→ dionysus69 joined09:37
← alesan left09:52
← GankMove left09:54
→ mirrorbird joined09:59
→ mat001_ joined09:59
← jaziz left10:00
→ sinhue joined10:01
← mat001 left10:02
← Darcidride left10:04
← calcul0n left10:06
→ calcul0n_ joined10:06
← pa left10:08
← dqx_ left10:08
→ FabioP joined10:09
→ pa joined10:13
→ Darcidride joined10:17
← Darcidride left10:18
← g00s left10:23
→ malmalmal joined10:24
→ vngx joined10:26
malmalmal Hello, I use git checkout -f in a post-receive hook as a deploy technique. But I only want to deploy the contents of a certain folder in the root of the repo (not the folder itself). Can sparse-checkout be used for this purpose?10:26
I see sparse-checkout used to pull parts of a repo, such as a folder, but not during a deploy.10:27
→ init joined10:30
→ shabius_ joined10:30
← shabius left10:33
→ sunova joined10:36
← txtsd left10:36
→ txtsd joined10:41
← sunova left10:43
→ deadrom joined10:44
← lightstalker left10:48
→ lightstalker joined10:51
osse malmalmal: git checkout -f -- paths maybe?10:55
malmalmal thanks osse do you know if that will accept wildcards as to checkout only the contents of the folder ?10:57
I've seen some not too clean solutions that involve bash scripting in order to achieve that10:57
osse malmalmal: if you give it a folder it will checkout that whole folder11:00
and nothing more11:00
→ Gurkenglas joined11:00
malmalmal including the folder11:01
or excluding ?11:01
osse including11:01
malmalmal thanks, osse , so how to exclude the folder would be my question11:02
if possible11:02
osse hmm11:02
you said you only wanted to deploy the contents of a certain folder, right?11:02
so git checkout -f -- a/certain/folder11:03
→ dqx_ joined11:03
osse or has the question changed?11:03
malmalmal and that will NOT deploy the folder itself ?11:03
deadrom hi all. rook question: /.git/config.lock <- is that a git issue or OS/FS issue that transpires into git?11:03
osse malmalmal: I don't understand that question11:03
malmalmal Sorry osse , I mean if the path is a/certain/folder, will 'folder' appear in the deploy destination or only the files within 'folder' ?11:04
→ noonien joined11:04
osse a/certain/folder will appear11:04
malmalmal how to make it not appear, that is the question11:06
to deploy only the folder contents11:06
and not the folder itself11:06
→ mightyjens joined11:07
malmalmal to deploy the content of /htdocs to destination, without deploying htdocs/ itself11:07
→ Noti joined11:07
osse I was confused by your words11:08
Maybe git archive is a better choice for this11:08
← feriman left11:09
malmalmal hmm11:09
osse git -C htdocs archive HEAD | tar -C somewhere xf -11:09
or move them up after checkout out11:09
!deploy11:09
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html11:09
malmalmal thank you I'll look into it11:11
← jimklimov left11:11
← ChrisLane left11:13
← howdoi left11:13
→ jimklimov joined11:13
← mightyjens left11:15
← malmalmal left11:15
→ malmalmal joined11:17
→ mightyjens joined11:17
→ cation21 joined11:18
← jimklimov left11:19
← mightyjens left11:19
→ jimklimov joined11:19
→ ChrisLane joined11:20
→ Newami joined11:20
→ jimklimov1 joined11:21
← malmalmal left11:22
← cd left11:22
← jimklimov left11:24
← tarkus left11:29
← init left11:33
← sudoforge left11:38
→ opal joined11:40
→ drbean joined11:45
← BtbN left11:50
→ BtbN joined11:50
→ roxlu joined11:50
roxlu hi, I accidentally pushed a commit that contained a file that I didn't want to commit/push. I found this post that I can use to fix it: https://stackoverflow.com/questions/18357511/git-remove-committed-file-after-push but I'm wondering if I can use `git checkout HEAD^ -- /path/to/file`. I'11:51
I'm working in a feature branch.. and curious if `HEAD` points to the feature branch or another?11:52
selckin git rev-parse HEAD11:53
→ fuzzmz_ joined11:53
← fuzzmz left11:54
fuzzmz_ → fuzzmz11:54
roxlu selckin: thanks! so HEAD^ (with ^) points to one commit before that?11:54
→ Mattiaslndstrm joined11:59
j416 roxlu: the first parent. man gitrevisions11:59
gitinfo roxlu: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html11:59
j416 roxlu: HEAD points to whatever you have checked out.12:00
← Lucas_Gray left12:02
→ ekh joined12:05
← lmat left12:10
→ lmat joined12:11
← Newami left12:12
→ cuppajoeman joined12:14
← cuppajoeman left12:15
→ cuppajoeman joined12:15
→ malmalmal joined12:17
← malmalmal left12:22
← Tobbi_ left12:28
→ Tobbi_ joined12:28
→ AL13N_lappy joined12:29
AL13N_lappy for git blame, i have some local uncommitted modifications, how can i get do the git blame on the HEAD file, not the work file?12:30
ikke git blame HEAD <file>12:31
← hussam left12:34
→ mowcat joined12:36
→ stats4647 joined12:36
→ sdwrage joined12:40
← stats4647 left12:41
→ calcul0n joined12:45
→ clara97 joined12:46
← ekh left12:47
← calcul0n_ left12:48
→ hussam joined12:54
→ tafa2 joined12:54
→ Aquazi joined12:56
→ meropyri_ joined12:58
← meropyri left12:58
→ cosimone_ joined13:00
← sdwrage left13:00
← cosimone left13:02
→ Lucas_Gray joined13:06
→ OnkelBlade joined13:06
→ crose joined13:07
← strudla left13:07
← tafa2 left13:08
→ sdwrage joined13:10
→ AnAverageHuman joined13:11
← Jookia left13:11
← calcul0n left13:11
→ strudla joined13:11
← tpaper left13:12
← la_croix left13:12
→ tafa2 joined13:13
→ tpaper joined13:14
→ Jookia joined13:14
← milkt left13:15
← andreas303 left13:15
← sobukus left13:16
← Hello71 left13:16
→ sobukus joined13:16
→ Hello71 joined13:17
← Xenguy left13:18
← Xiti left13:19
→ andreas303 joined13:19
← Lucas_Gray left13:21
AL13N_lappy ikke: well, that was anticlimatic... i was looking for the options in the man page, but it's just an optional argument, and so i looked over it :-(13:21
← mirrorbird left13:21
← cuppajoeman left13:21
→ sbetrium joined13:22
← magic_ninja left13:22
→ magic_ninja joined13:25
→ Lucas_Gray joined13:28
← tafa2 left13:28
← cosimone_ left13:29
→ Xiti joined13:29
→ justanotheruser joined13:31
← sdwrage left13:31
← Lucas_Gray left13:33
→ lucasb joined13:43
← drbean left13:47
← denel left13:47
→ denel joined13:48
→ thomasross joined13:51
→ Lucas_Gray joined13:52
← sbetrium left13:52
→ Aki-lucky joined13:53
← Aki-lucky left13:54
→ Aki-lucky joined13:54
← KnoP left13:54
→ donofrio joined13:56
← vicfred left13:56
→ sbetrium joined13:57
→ calcul0n joined13:58
← OnkelBlade left14:07
← konrados left14:08
→ OnkelBlade joined14:15
→ gast0n joined14:15
→ thiago joined14:18
← kjartan left14:19
← AL13N_lappy left14:19
← cbreak left14:20
→ cbreak joined14:21
← pikapika left14:22
→ pikapika joined14:22
← pikapika left14:23
→ pikapika joined14:23
← acetakwas left14:24
→ acetakwas joined14:26
← nikivi left14:26
← pikapika left14:26
← acetakwas left14:26
→ nikivi joined14:27
→ AL13N_lappy joined14:27
→ acetakwas joined14:27
← acetakwas left14:27
← POQDavid left14:28
→ POQDavid joined14:28
→ kjartan joined14:28
→ init joined14:29
→ Noldorin joined14:31
→ stats4647 joined14:32
← nurdie left14:33
← init left14:34
← OnkelBlade left14:34
→ OnkelBlade joined14:36
← POQDavid left14:36
← AL13N_lappy left14:36
→ POQDavid joined14:37
← kjartan left14:38
→ mirrorbird joined14:38
← POQDavid left14:40
← nikivi left14:40
← OnkelBlade left14:40
→ POQDavid joined14:40
→ nikivi joined14:41
→ nurdie joined14:41
→ kjartan joined14:42
← Lucas_Gray left14:42
→ cosimone joined14:46
← Human_G33k left14:51
← Moistmelon left14:55
← clara97 left14:55
→ Moistmelon joined14:56
← mat001_ left14:56
→ p-core joined14:56
← Tobbi_ left14:58
→ kenwoodfox_ joined14:58
→ jmd joined14:59
← kjartan left15:00
→ neckutrek joined15:00
→ greggerz joined15:00
jmd How can I get rid of this "WARNING: terminal is not fully functional" message that git keeps printing?15:00
selckin fix your terminal15:00
→ kjartan joined15:00
← kenwoodfox left15:00
jmd My terminal is fine. Git just doesn't know it.15:01
selckin our god git is never wrong15:01
windwos cygwin?15:01
ikke jmd: verify $TERM15:01
→ cahoots joined15:02
← sweatsuit left15:02
jmd "dumb"15:02
ikke Right, so that's the issue15:02
→ mat001 joined15:02
jmd So is there a patch to make git work properly with dumb terminals? Where do I download it?15:03
→ HumanG33k joined15:03
→ Tobbi_ joined15:03
ikke jmd: what terminal do you use?15:03
something like `export TERM=xterm` would already fix it if your terminal is compattible with xterm15:04
`dumb` is basically a fall-back when the terminal is not known15:04
cahoots hi, i want to clone a repo with a specific commit sha and depth 1. this is apparently possible in git 2.5+ with uploadpack.allowReachableSHA1InWant but i'm not sure what exactly to do. any ideas?15:05
jmd Right. So my question was, How do I stop this warning message?15:05
ikke ^^\15:05
← oxymoron93 left15:06
→ tarkus joined15:06
→ karab44 joined15:06
cahoots ikke, any ideas?15:07
easy for branch and tag, just less well-documented for this new thing for shas15:07
← stats4647 left15:07
DuClare jmd: find a different pager15:09
ikke jmd: You need to set TERM to a value that's suitable for your terminal15:09
→ stats4647 joined15:09
← FFY00 left15:11
← mat001 left15:11
DuClare jmd: Or disable pager altogether15:12
→ m0viefreak joined15:12
→ FFY00 joined15:13
ikke Other programs would complain as well, though15:13
← FFY00 left15:13
→ FFY00 joined15:14
→ sweatsuit joined15:14
← Noti left15:15
jmd DuClare: so how do I set the pager?15:17
← tonyj left15:17
→ tonyj joined15:18
DuClare export PAGER=15:19
Or whatever syntax your shell uses15:19
Hello71 i think that default to less15:20
→ arcatech joined15:20
← LionsMane left15:23
← greggerz left15:24
→ mat001 joined15:24
→ wnbeser joined15:25
cahoots i think i've stumped the git god ikke15:25
← magic_ninja left15:26
→ cd joined15:28
→ magic_ninja joined15:29
← dionysus69 left15:29
→ dionysus69 joined15:29
→ irc_user joined15:30
← kjartan left15:30
→ kurkale6ka joined15:30
→ tiin57 joined15:30
← arcatech left15:32
← mat001 left15:32
→ kjartan joined15:34
→ Papillon joined15:34
→ emg joined15:35
emg when making a change to a single patch in a patch set, is it customary to resend only that patch with an incremented version number (e.g. v2 -> v3) or to resend the entire patch set?15:35
→ greggerz joined15:38
← tiin57 left15:38
← kjartan left15:39
← kurkale6ka left15:39
← Papillon left15:40
→ mat001 joined15:41
→ kjartan joined15:45
→ oatmealraisin joined15:46
← AnAverageHuman left15:49
→ mckendricks joined15:49
→ vicfred joined15:50
← rfuentess left15:50
← wnbeser left15:51
← Muimi left15:52
← ghost43 left15:53
→ durham joined15:53
→ ghost43_ joined15:53
← durham left15:53
→ mven joined15:55
← Adapc left15:56
← n000g left15:56
← mat001 left15:58
← p-core left15:59
← dfee left15:59
← kjartan left16:00
DuClare emg: Entire set imo16:01
But I don't know if there are projects with different customs16:01
→ dfee joined16:01
← mckendricks left16:02
→ mat001 joined16:04
→ n000g joined16:04
→ Guest20 joined16:05
← TomyWork left16:05
← chele left16:05
→ aliss joined16:07
→ tiin57 joined16:11
← tiin57 left16:12
→ arcatech joined16:13
→ ekh joined16:17
quesker I have a file that might get modified but I don't want changes to ever be committed. just add it to .gitignore? or is there another way I can do it?16:20
← deadrom left16:22
→ zumba_ad_ joined16:23
← a-l-e left16:24
→ a-l-e joined16:24
→ Siecje joined16:24
Siecje I have a branch with merge commits. I want to squash all of my commits and then rebase on master. Can I do this with a branch with merge commits?16:25
Hello71 cahoots: the point of that is that you need to set it on the *server*16:25
→ mir100 joined16:27
→ tiin57 joined16:28
→ theoceaniscool joined16:28
→ troulouliou_div2 joined16:29
← jmd left16:29
← zumba_ad_ left16:30
← a-l-e left16:32
← tiin57 left16:34
→ mckendricks joined16:36
quesker even with .gitignore git add seems to add it and it gets committed16:37
→ CodeSlingerPaul joined16:38
← mat001 left16:39
quesker oh I found this git update-index --assume-unchanged file16:39
cahoots Hello71, indeed it's set on the server (it's github). now if i run `git clone --depth=1 <repo> && git fetch --depth=1 origin <sha>` it'll work, although now i'm doing two shallow fetches. any way to avoid the first one?16:40
quesker that seems to do it16:40
→ mat001 joined16:41
Hello71 cahoots: probably something like git init; git remote add origin repo; etc16:41
→ darkbit joined16:42
→ tiin57 joined16:42
← ekh left16:42
← dionysus69 left16:43
← mirrorbird left16:44
→ kjartan joined16:47
→ ekh joined16:51
→ la_croix joined16:52
← mckendricks left16:53
← ekh left16:56
→ alesan joined16:58
← tiin57 left16:58
← POQDavid left17:04
→ POQDavid joined17:05
← Guest20 left17:05
← dfee left17:06
← dansan left17:08
→ mirrorbird joined17:08
← nikivi left17:09
→ nikivi joined17:09
→ dfee joined17:09
→ Human_G33k joined17:14
→ tiin57 joined17:14
← HumanG33k left17:17
← troulouliou_div2 left17:25
← cosimone left17:29
← decompoze left17:32
← kjartan left17:33
→ kjartan joined17:37
← dfee left17:39
← aliss left17:39
cahoots good call Hello7117:40
→ dfee joined17:41
← tiin57 left17:43
← karab44 left17:45
Hello71 I think git archive takes a sha17:46
maybe git archive should support this api17:46
→ tiin57 joined17:47
← kjartan left17:52
→ Atlenohen joined17:52
→ blahboybaz joined17:53
→ Lartza joined17:53
Lartza I can't seem to get any way to work to not touch timestamps at all and just change email of all commits17:53
Neither rebase or amend seems to like committer-date-is-author-date17:54
At least in interactive mode17:54
Hello71 filter-branch17:55
→ ekh joined17:56
← ekh left18:00
← sbetrium left18:00
→ kjartan joined18:02
→ sbetrium joined18:03
← CodeSlingerPaul left18:05
Lartza Thank you!18:06
← kjartan left18:07
→ init joined18:08
→ kjartan joined18:09
→ davispuh joined18:09
← mirrorbird left18:10
← tiin57 left18:13
← init left18:14
→ tafa2 joined18:15
→ mirrorbird joined18:16
→ howdoi joined18:16
→ tiin57 joined18:16
← mat001 left18:16
→ mat001 joined18:17
← heftig left18:23
← elibrokeit left18:23
← kjartan left18:23
← bocaneri left18:24
blahboybaz When I forgot to put the "-u origin" in my "git push" it seemed to do the same thing anyway. Am I understanding it right? If so, then what do I need the "-u origin" for then anyway? Why not just do "git push" and be done with it?18:24
→ pikapika joined18:27
nedbat blahboybaz: my understanding is you need the "-u origin" the first time you push, and then you don't need it for subsequent pushes.18:28
blahboybaz nedbat: So glad to learn that. Thanks18:28
→ heftig joined18:28
→ elibrokeit joined18:29
→ acetakwas joined18:29
→ geosmile joined18:30
→ d^sh joined18:31
← d^sh left18:32
→ kjartan joined18:35
← theoceaniscool left18:40
← Heirlung left18:41
→ theoceaniscool joined18:41
→ init joined18:42
→ GankMove joined18:42
← tiin57 left18:43
→ vdamewood joined18:43
← gxt left18:43
→ impermanence joined18:43
← duderonomy left18:44
→ jastiv joined18:45
← theoceaniscool left18:46
→ tiin57 joined18:47
← Aquazi left18:47
→ theoceaniscool joined18:48
→ LionsMane joined18:50
→ cdown joined18:51
← init left18:51
← theoceaniscool left18:53
← tarkus left18:57
→ duderonomy joined18:58
→ leeN joined18:58
← ghost43_ left19:02
→ ghost43 joined19:03
→ mckendricks joined19:03
→ g00s joined19:04
→ theoceaniscool joined19:06
→ Heirlung joined19:08
← mckendricks left19:09
← tiin57 left19:13
→ tiin57 joined19:17
→ kristjanlink joined19:20
← kristjanlink left19:22
→ Phylock joined19:24
→ dansan joined19:29
← duderonomy left19:29
→ init joined19:32
→ tgunr joined19:33
← cdown left19:34
→ cdown joined19:34
jastiv someone commited a crap branch of nothing to my sourceforge project, what is the best way forward with git19:38
nedbat jastiv: you could delete the branch19:39
← Phylock left19:39
jastiv opps, I didn't mean a branch, they commited to master19:40
And I don't even know how they managed that, they arn't on the project, and have a fake email address19:41
← init left19:42
jastiv I'm definatly thinking of having a couple more public repositories after this too.19:42
← tiin57 left19:43
→ duderonomy joined19:43
emg sent a patch, any idea how long it normally takes to show up on the archives so I can tell if it actually sent correctly?19:45
ikke couple of minutes19:45
Sometimes a bit longer19:46
→ tiin57 joined19:46
emg been 30, guess I probably screwed something up19:46
→ zumba_ad_ joined19:46
emg shows up in my sent mail...19:46
ikke The mailing list uses graylisting19:47
emg ah, if I'm not subscribed and it's my first mail, someone has to approve it first?19:47
ikke No19:48
It means that your mail client needs to be persistent in sending it19:48
The first time it will be rejected with a temporary failure19:48
emg didn't see an error or any reply stating there was an error19:49
ikke Your client might be hiding it19:49
emg I used git send-email19:50
with gmail's smtp19:50
ikke THen it's gmails smtp that will try again19:50
← mirrorbird left19:52
← dqx_ left19:53
→ h3ck joined19:59
→ archwizard joined20:00
→ Lucas_Gray joined20:02
← archwizard56 left20:04
← Sleepy63 left20:07
→ wootehfoot joined20:07
← tiin57 left20:13
→ tiin57 joined20:16
ikke hmm, don't see anything yet20:17
emg also tried [email@hidden.address] as mentioned here http://vger.kernel.org/majordomo-info.html but got a no such user reply for that (also noticed the page is 18 years old, but it's still linked directly from vger.kernel.org ...20:18
→ alexkubicail joined20:20
→ totallynotnate joined20:21
→ init joined20:24
← tiin57 left20:24
→ tiin57 joined20:25
emg here's the original from my sent folder: http://ix.io/2yIU see any obvious issues?20:26
ikke Looks alright20:27
→ KnoP joined20:30
← dfee left20:37
← st-gourichon-fid left20:37
← leeN left20:38
→ st-gourichon-fid joined20:38
← totallynotnate left20:40
← alexkubicail left20:40
→ leeN joined20:40
← Siecje left20:43
← tiin57 left20:43
→ tiin57 joined20:46
emg hey it finally made it through20:47
← darkbit left20:47
← sbetrium left20:57
→ jaziz joined20:58
→ dfee joined20:59
→ sbetrium joined21:00
← simon816 left21:05
→ mark4 joined21:05
mark4 how do i compare foo.c in my local branch with the one in origin/develop ? i tried to find this but all i find is how to compare a complete branch with another complete branch, not specific files21:06
emg git diff origin/develop -- foo.c21:06
← crose left21:08
mark4 ok so i did a git pull on a very old branch that i need to start working on again, i then did a git merge origin/develop and there was one very tiny difference in this one file that i resolved21:10
← cahoots left21:10
→ simon816 joined21:10
mark4 i pushed and now i do a git diff on my file and the one in origin/develop and there are HUGE diffs!21:10
← tiin57 left21:13
→ tiin57 joined21:16
← mark4 left21:23
→ bsanford joined21:27
← bsanford left21:27
← sbetrium left21:30
← Atlenohen left21:33
← meLon left21:34
→ sbetrium joined21:34
← mat001 left21:40
← tiin57 left21:43
← mowcat left21:45
← simon816 left21:45
→ tiin57 joined21:46
→ simon816 joined21:48
→ navidr joined21:50
← Milos left21:52
→ Milos joined21:53
→ mat001 joined21:55
← KnoP left21:58
← mven left21:59
← PJBoy left22:00
← sbetrium left22:03
→ mven joined22:07
← tiin57 left22:13
→ nurdie_ joined22:13
← nurdie left22:16
→ tiin57 joined22:16
→ mowcat joined22:17
← meropyri_ left22:17
→ cliluw joined22:17
→ meropyri joined22:18
← random_yanek left22:18
← h3ck left22:18
← nurdie_ left22:19
→ nurdie joined22:19
← nurdie left22:23
← tafa2 left22:24
→ tafa2 joined22:25
← Lucas_Gray left22:26
← Soni left22:26
→ Lucas_Gray joined22:26
← thomasross left22:28
→ sbetrium joined22:28
→ thomasross joined22:28
← Shentino left22:28
→ Shentino joined22:29
→ h3ck joined22:29
→ random_yanek joined22:29
← greggerz left22:30
← m0viefreak left22:35
← mven left22:36
→ mven joined22:37
→ PJBoy joined22:38
← irc_user left22:39
→ Soni joined22:40
← mven left22:42
← tiin57 left22:43
← zumba_ad_ left22:43
← dfee left22:44
← Soni left22:45
→ tiin57 joined22:46
← leeN left22:47
→ gitter1234 joined22:48
→ mven joined22:50
→ cahoots joined22:56
← sbetrium left22:57
→ pac1 joined22:57
→ pac1_ joined22:58
← pac1 left22:58
→ Soni joined22:59
← calcul0n left22:59
← wootehfoot left23:02
→ sbetrium joined23:03
← Soni left23:03
→ dfee joined23:04
← h3ck left23:05
← Lucas_Gray left23:06
← mven left23:08
→ zumba_ad_ joined23:09
→ Randy_ joined23:10
→ stfn1 joined23:11
→ f-chymera joined23:11
→ DANtheBEASTman joined23:11
→ QshelTier joined23:11
← tiin57 left23:13
← mu_ left23:13
← level3 left23:13
← Bombe left23:13
← dysfigured left23:13
← stfn left23:13
← Randy left23:13
← chymera left23:13
← dka left23:13
DANtheBEASTman → dysfigured23:13
Randy_ → Randy23:13
← init left23:13
→ Soni joined23:13
← zumba_ad_ left23:13
→ mu joined23:14
cahoots hi, when i do `git fetch --depth=1 origin <sha>`, where that sha is some commit on master, for some commits it works, but for some commits i get the message "server does not allow request for unadvertised object". why might this be?23:15
→ tiin57 joined23:16
← eb0t left23:18
← eblip left23:18
← cdown left23:18
→ eblip joined23:20
→ eb0t joined23:21
← vdamewood left23:29
→ mven joined23:31
← sbetrium left23:31
← mven left23:34
→ mven joined23:34
→ sbetrium joined23:37
← Gurkenglas left23:41
← gast0n left23:42
← tiin57 left23:43
→ tiin57 joined23:46
← Anticom left23:47
→ Betal joined23:50

Logs Search ←Prev date Next date→ Channels Documentation