IRCloggy #git 2018-02-02

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.

2018-02-02

← finalbeta left00:00
← weez17 left00:00
→ weez17 joined00:00
→ qswz joined00:01
← sanscoeur left00:02
qswz imagine I work temporarily on a branch foo, and my master branch is clean, from foo, without leaving foo, would there be a way to sync master (git pull) so that I can just git rebase master from foo00:02
I could make an alias that do those multiple things00:03
→ weijin joined00:05
→ xaxxon joined00:05
qswz if I commt on foo, to make it clean00:06
I just have to make an alias doing git co master && git pull && git co ..00:07
having a way to get back to original, like a variable00:07
← thiago left00:10
← weijin left00:10
qswz https://stackoverflow.com/questions/39460740/git-shortcut-for-checkout-pull-checkout-merge-rebase00:10
← leprechau left00:10
→ muelleme joined00:11
qswz git fetch origin master:master00:12
→ JanC joined00:15
← kerrick left00:15
→ leprechau joined00:15
qswz thanks guys00:16
← muelleme left00:17
→ jready joined00:17
← GoBear left00:17
→ Kaisyu joined00:17
← afuentes left00:18
→ kerrick joined00:19
← kadoban left00:20
← jready left00:21
→ LoggerZZZ joined00:22
← LoggerZZZ left00:22
→ jready joined00:24
→ LoggerZZZ joined00:24
← oxymoron93 left00:27
← raz0r9 left00:27
→ raz0r9 joined00:31
← LoggerZZZ left00:31
← aax left00:31
← mikecmpbll left00:32
← nellicus_ left00:32
← Pacra left00:32
→ LoggerZZZ joined00:32
→ ResidentBiscuit joined00:33
← orbyt_ left00:34
← dsdeiz left00:34
← randomstrangerb left00:34
→ weijin joined00:34
→ randomstrangerb joined00:34
→ dsdeiz joined00:35
← jready left00:35
← LoggerZZZ left00:35
→ jimi_ joined00:35
→ zarzar1 joined00:36
← moei left00:36
→ nellicus_ joined00:36
← zarzar left00:37
→ moei joined00:37
→ LoggerZZZ joined00:37
← ResidentBiscuit left00:38
→ DanielKarp joined00:39
← weijin left00:41
← wintrytbs left00:41
← LoggerZZZ left00:43
← jimi_ left00:44
→ Pacra joined00:44
→ LoggerZZZ joined00:44
← LoggerZZZ left00:45
← widp left00:47
← xaxxon left00:49
→ figurehe4d joined00:52
← veegee left00:55
→ LoggerZZZ joined01:01
← LoggerZZZ left01:01
← Cabanossi left01:04
→ Cabanossi joined01:05
← raz0r9 left01:05
← Pacra left01:06
← qswz left01:07
→ wxg joined01:08
← Murr left01:08
→ Murr joined01:08
→ jottr_ joined01:09
→ weijin joined01:12
← jottr left01:12
← nowhere_man left01:13
→ nowhereman joined01:13
← rafasc left01:13
→ Lyqyd joined01:15
← shinnya left01:16
→ Pacra joined01:16
← EvilPenguin left01:20
← weijin left01:20
→ minionofgozer joined01:21
← konsolebox left01:22
← cbreak left01:23
← cyberz left01:23
qpdb → Guest5357901:23
→ qpdb joined01:23
→ cbreak joined01:25
→ cyberz joined01:25
→ jimi_ joined01:26
← Guest53579 left01:26
→ durham_ joined01:29
→ konsolebox joined01:29
← durham left01:32
→ LoggerZZZ joined01:32
← LoggerZZZ left01:32
← AfroThundr left01:32
← durham_ left01:34
← randomstrangerb left01:34
→ randomstrangerb joined01:35
→ LoggerZZZ joined01:35
← LoggerZZZ left01:35
→ AfroThundr joined01:38
← jottr_ left01:38
← DanielKarp left01:38
← kerrick left01:39
← Pacra left01:40
← nowhereman left01:40
→ nowhere_man joined01:41
→ weijin joined01:42
→ raz0r9 joined01:42
→ kerrick joined01:43
← hugdru left01:43
→ cur8or joined01:43
→ LoggerZZZ joined01:44
← LoggerZZZ left01:44
→ uzumaki joined01:44
→ LoggerZZZ joined01:46
← LoggerZZZ left01:46
← weijin left01:46
→ widp joined01:47
→ LoggerZZZ joined01:48
← LoggerZZZ left01:48
→ Raed|Mobile joined01:49
→ cdg joined01:49
← Gurkenglas left01:50
→ LoggerZZZ joined01:50
← LoggerZZZ left01:51
← mooasaurus left01:52
→ mooasaurus joined01:52
← kerrick left01:52
← Sasazuka__ left01:52
→ LoggerZZZ joined01:54
← cdg left01:54
← VoradorPT left01:57
← Masterphi left01:59
← ISmithers left02:00
← LoggerZZZ left02:01
→ LoggerZZZ joined02:03
→ weijin joined02:04
← LoggerZZZ left02:05
← jimi_ left02:05
← Xiti left02:06
→ Xiti joined02:07
→ LoggerZZZ joined02:08
← cust left02:10
→ muralisc joined02:11
→ cfoch_ joined02:12
← LoggerZZZ left02:13
→ LoggerZZZ joined02:13
→ spicerack joined02:14
← raz0r9 left02:16
→ thiago joined02:16
← alezandro left02:17
→ Arcaelyx joined02:19
← govg left02:19
→ mib_jme384 joined02:23
← mib_jme384 left02:24
→ raz0r9 joined02:25
← LoggerZZZ left02:26
← TomyLobo left02:26
→ LoggerZZZ joined02:28
→ finalbeta joined02:28
← tanuki left02:29
→ ABXZ joined02:30
← widp left02:30
← gordonfish left02:31
← hahuang65 left02:32
← peepsalot left02:32
← muralisc left02:33
→ salman_ joined02:34
← ABXZ left02:34
← raz0r9 left02:37
→ [Brain] joined02:37
→ gordonfish joined02:39
→ tanuki joined02:39
← Guest24355 left02:39
→ Quakeguy01 joined02:41
→ kerrick joined02:41
← finalbeta left02:41
→ finalbeta joined02:42
← kerrick left02:43
→ zzz joined02:44
← [Brain] left02:44
→ widp joined02:44
→ peepsalot joined02:45
← ilbot3 left02:46
→ kpease joined02:49
← DistantS` left02:49
McKraken_zzzzz → McKraken02:51
→ kerrick joined02:52
← kerrick left02:53
← salman_ left02:56
→ ilbot3 joined02:59
← asphyxia left03:00
← finalbeta left03:00
→ finalbeta joined03:00
→ muralisc joined03:01
→ raz0r9 joined03:04
← muralisc left03:05
→ chachasmooth_ joined03:06
← chachasmooth left03:06
← Murr left03:08
→ Murr joined03:08
← raz0r9 left03:08
← Praxi left03:08
→ muralisc joined03:09
→ kadoban joined03:09
← LoggerZZZ left03:10
← venmx left03:10
→ LoggerZZZ joined03:13
krok → k03:15
← kpease left03:16
→ Paker joined03:16
→ orbyt_ joined03:20
→ alezandro joined03:20
→ raz0r9 joined03:21
→ Amanas joined03:24
← Quakeguy01 left03:26
← dsdeiz left03:26
→ dsdeiz joined03:26
← raz0r9 left03:29
→ canvon_ joined03:30
← canvon left03:30
→ durham joined03:31
→ govg joined03:33
← dviola left03:34
← dsdeiz left03:36
→ dsdeiz joined03:36
→ DammitJim joined03:36
← Paker left03:37
→ dviola joined03:37
→ star_prone joined03:38
← govg left03:39
→ relipse joined03:39
→ govg joined03:40
→ lagothri1 joined03:40
← Raed|Mobile left03:40
→ relipse__ joined03:42
← lagothrix left03:43
← cur8or left03:43
← star_prone left03:44
← relipse left03:44
→ raz0r9 joined03:44
→ Raed|Mobile joined03:45
← aielima left03:48
DammitJim I have all these files that i would like to put in a git repository03:49
but not only on a local repository but on a remote master03:49
what should be the first thing I do?03:49
← akushner left03:52
→ jready joined03:52
→ westies joined03:53
← LoggerZZZ left03:55
← dsdeiz left03:55
← disi left03:56
→ dsdeiz joined03:56
← dsdeiz left03:56
→ dsdeiz joined03:56
← jready left03:56
→ disi joined03:57
← figurehe4d left04:01
← Tobbi left04:02
→ muelleme joined04:03
→ xaxxon joined04:04
→ cdg joined04:05
← Thaelim left04:07
← Noldorin left04:07
← muelleme left04:07
← cdg left04:10
← ghost43 left04:12
← uzumaki left04:13
← leeN left04:13
← diegoaguilar left04:16
← raz0r9 left04:17
→ ghost43 joined04:17
← durham left04:19
← Cabanossi left04:20
→ Cabanossi joined04:22
← weijin left04:23
→ g00s joined04:24
→ imack joined04:27
← dsdeiz left04:28
→ dsdeiz joined04:29
← dsdeiz left04:29
→ dsdeiz joined04:29
← DammitJim left04:29
→ mohabaks joined04:29
← xaxxon left04:32
→ DistantS` joined04:32
← alezandro left04:34
← vith left04:36
→ vith joined04:36
→ salman_ joined04:37
→ aielima joined04:39
justan0theruser → justanotheruser04:41
→ raz0r9 joined04:41
→ menip joined04:43
← relipse__ left04:44
← raz0r9 left04:46
→ M6HZ joined04:49
← Amanas left04:51
→ weijin joined04:52
→ babyflakes joined04:53
→ raz0r9 joined04:55
→ jungsubk joined04:59
← peepsalot left04:59
← dsdeiz left05:00
→ dsdeiz joined05:01
← pks left05:03
→ pks joined05:04
→ Darcidride joined05:07
→ dreiss joined05:08
← Murr left05:08
→ Murr joined05:08
→ Andrew_K joined05:09
← Garen left05:11
→ peepsalot joined05:12
→ Garen joined05:12
← jungsubk left05:13
← zzz left05:26
← weijin left05:27
← raz0r9 left05:28
← aielima left05:29
← Moistmelon left05:29
← dsdeiz left05:30
→ aielima joined05:30
→ dsdeiz joined05:30
→ weijin joined05:30
← peepsalot left05:31
← piggah left05:31
← salman_ left05:32
→ raz0r9 joined05:32
← weijin left05:35
→ Masterphi joined05:37
→ xaxxon joined05:40
← jimmyrcom left05:42
→ peepsalot joined05:42
→ jungsubk joined05:42
← orbyt_ left05:42
← Lyqyd left05:43
→ weijin joined05:44
← mohabaks left05:46
← menip left05:47
→ regedit joined05:48
→ justan0theruser joined05:50
← justanotheruser left05:53
→ cur8or joined05:54
← dreiss left05:55
← hmmwhatsthisdo_ left05:57
← dviola left05:58
→ asphyxia joined06:00
← asphyxia left06:00
→ MoziM joined06:03
→ mohabaks joined06:03
← wxg left06:03
← dsdeiz left06:04
← dave0x6d left06:05
→ wxg joined06:05
→ dsdeiz joined06:05
← raz0r9 left06:07
→ ZyX-I joined06:10
← Masterphi left06:10
→ Jak_o_Shadows joined06:10
→ dege joined06:11
→ menip joined06:13
→ raz0r9 joined06:13
→ kerrick joined06:14
→ sQVe joined06:14
→ jalspons joined06:15
McKraken → McKraken_zzzzz06:16
← sQVe left06:16
← dege left06:16
→ zulutango joined06:18
→ sQVe joined06:19
→ LocaMocha joined06:19
← LocaMocha left06:19
→ akushner joined06:20
← xaxxon left06:20
← mooasaurus left06:22
→ LocaMocha joined06:23
→ akushner_ joined06:24
← raz0r9 left06:24
← akushner left06:25
→ piggah joined06:26
← widp left06:28
→ ogny joined06:29
→ raz0r9 joined06:31
← jungsubk left06:31
→ Sasazuka joined06:32
→ jungsubk joined06:34
← raz0r9 left06:35
→ star_prone joined06:36
← Sasazuka left06:38
← sQVe left06:38
→ mooasaurus joined06:39
→ Masterphi joined06:40
→ giraffe joined06:40
← star_prone left06:41
← Masterphi left06:41
← Kaj left06:41
→ K4j joined06:42
K4j → Kaj06:43
→ _noblegas joined06:43
→ masuberu joined06:45
← Kaj left06:46
→ Kaj joined06:46
← boombatower left06:49
← quesker left06:51
→ Raging_Hog joined06:51
← Arcaelyx left06:51
→ sQVe joined06:52
← PioneerAxon left06:54
→ quesker joined06:55
← sQVe left06:57
→ Masterphi joined06:58
← muralisc left06:59
← Masterphi left07:00
→ Masterphi joined07:00
→ rkd joined07:01
← Masterphi left07:01
→ mikemcowie joined07:02
→ PioneerAxon joined07:02
→ wandering_vagran joined07:03
← plasticle left07:04
→ xaxxon joined07:04
← diogenese left07:06
→ Masterphi joined07:07
← wxg left07:07
← Masterphi left07:08
→ wxg joined07:08
→ dege joined07:08
→ diogenese joined07:09
← menip left07:09
← kerrick left07:11
→ dre_ joined07:11
→ Pacra joined07:11
← thiago left07:18
← win0err left07:19
→ metts joined07:21
← rkd left07:23
→ abba joined07:24
→ ocds joined07:25
← akushner_ left07:26
→ akushner joined07:27
→ rkd joined07:27
← akushner left07:27
← rory left07:29
→ tunekey joined07:30
← g00s left07:31
→ nasd4 joined07:31
← toshiro left07:33
→ tshro joined07:34
→ star_prone joined07:35
← tshro left07:35
→ nerdinja joined07:35
→ muralisc joined07:36
→ raz0r9 joined07:36
← star_prone left07:40
MoziM I'm using git to backup my dotfiles and there's always a massive wall of text from byte-compiled emacs-lisp files whenever I modify or install an emacs package. How can I configure git so that git only displays the files changed if the number of modified lines in a file exceeds 20?07:42
→ chele joined07:43
← nerdinja left07:43
→ nerdinja joined07:43
← xaxxon left07:45
justan0theruser → justanotheruser07:45
j416 MoziM: you can't unless maybe if you define a custom diff viewer, but you can mark the file as binary. See man gitattributes07:47
gitinfo MoziM: the gitattributes manpage is available at https://gitirc.eu/gitattributes.html07:47
← ocds left07:51
← mohabaks left07:52
osse MoziM: Sounds like those files shouldn't be part of the repo07:52
→ chaosruler joined07:53
← djb-irc left07:53
← jungsubk left07:55
→ star_prone joined07:56
← jalspons left07:58
← raz0r9 left07:58
→ raz0r9 joined07:59
→ JeroenT joined07:59
→ flaviodesousa joined08:00
← rkd left08:00
→ King_Hual joined08:00
← King_Hual left08:00
→ King_Hual joined08:00
→ widp joined08:02
← raz0r9 left08:03
← dre_ left08:04
← piggah left08:04
← star_prone left08:05
→ venmx joined08:07
← quesker left08:08
→ sQVe joined08:10
← wxg left08:10
→ oxymoron93 joined08:14
← Pacra left08:15
→ fosonmeng joined08:19
← fosonmeng left08:19
→ Moistmelon joined08:19
j416 That too.08:20
← weijin left08:21
← cfoch_ left08:21
→ mohabaks joined08:23
→ g00s joined08:24
← amosbird left08:25
→ tvw joined08:29
→ amosbird joined08:30
← _Patrick_ left08:31
→ _Patrick_ joined08:32
→ weijin joined08:34
→ Masber_080 joined08:38
→ nimomo joined08:39
← raynold left08:39
→ raz0r9 joined08:40
→ dmone joined08:40
← Masber_080 left08:42
← masuberu left08:42
→ Masber_080 joined08:43
← raz0r9 left08:44
→ masuberu joined08:44
← masuberu left08:48
← aielima left08:48
← Arokh left08:48
→ masuberu joined08:48
← Masber_080 left08:48
→ Gotham25 joined08:49
Gotham25 Hi. I need to get the branches with author who created .08:50
How to do it git bash ?08:50
← randomstrangerb left08:51
→ randomstrangerb joined08:51
tobiasvl Gotham25: what do you mean by "created"? who made the first commit on the branch when it diverged from another branch (master?)?08:52
← nimomo left08:52
← nanga left08:54
→ aielima joined08:54
→ nanga joined08:55
← regedit left08:57
Gotham25 tobiasvl: I mean the author of that branch08:58
← bngsudheer left08:58
← finalbeta left08:58
← venmx left08:58
→ afuentes joined08:58
Gotham25 tobiasvl: The branch in bitbucket must have created using create branch option right ?. I need to get the username of the person who did that.08:59
Can I do that in git bash ?08:59
→ finalbeta joined08:59
tobiasvl Gotham25: oh. I don't know anything about bitbucket. git does not track who first "created" a branch.08:59
→ mixaz joined09:00
Gotham25 tobiasvl: What does this do then ? git for-each-ref --format='%(color:cyan)%(authordate:format:%m/%d/%Y %I:%M %p) %(align:25,left)%(color:yellow)%(authorname)%(end) %(color:reset)%(refname:strip=3)' --sort=authordate refs/remotes09:00
← g00s left09:00
Gotham25 I get the usernames of the created branch....09:00
← aielima left09:00
→ schleppel joined09:00
← JeroenT left09:01
← sQVe left09:01
→ DaGoaty joined09:02
tobiasvl username?09:02
as in bitbucket username? or git author name of the person who committed first on the branch09:02
← disi left09:03
→ LoggerZZZ joined09:03
← Tawonga left09:03
tobiasvl or even who committed last09:03
Gotham25 the committed one09:03
→ sdhhgse joined09:04
→ disi joined09:04
→ mikecmpbll joined09:05
→ Arokh joined09:05
tobiasvl right. you get the last author who committed to the branch.09:05
Gotham25 tobiasvl: I have a query that lists the dead branches in my repo. git branch -r --merged master09:05
No how can I get the last commited author names along with it ?09:06
→ aielima joined09:06
← chaosruler left09:07
→ chaosruler joined09:07
← masuberu left09:08
← sdhhgse left09:08
→ jane_ joined09:09
← _noblegas left09:10
tobiasvl Gotham25: use "git for-each-ref" like you did above, but add "--merged master"09:10
→ yqt joined09:10
tobiasvl see man git for-each-ref09:10
gitinfo the git-for-each-ref manpage is available at https://gitirc.eu/git-for-each-ref.html09:10
← finalbeta left09:12
← mohabaks left09:12
→ bongjovi joined09:12
← LiftLeft left09:13
→ LiftLeft joined09:14
← jane_ left09:14
Gotham25 tobiasvl: Can you explain the query a bit ?. I don't understand at where it takes in the input09:14
← LoggerZZZ left09:14
→ LoggerZZZ joined09:15
→ raz0r9 joined09:15
← LoggerZZZ left09:15
tobiasvl Gotham25: the input is the last argument, what's called the "pattern" in the man page to match refs against. in your query that is "refs/remotes" ie. remote-tracking branches09:16
→ Tawonga joined09:16
tobiasvl so if you add "--merged master" it will filter those branches that match your pattern to only find the ones merged with master, as the man page explains09:16
← raz0r9 left09:16
← nephyrin left09:16
→ raz0r9 joined09:17
→ supernov1h joined09:19
Gotham25 tobiasvl: Thanks a lot09:19
It worked09:19
→ nimomo joined09:20
→ venmx joined09:20
→ kurkale6ka joined09:21
← raz0r9 left09:21
→ raz0r9 joined09:21
← raz0r9 left09:22
← supernovah left09:22
→ borkr joined09:22
← ZyX-I left09:22
→ raz0r9 joined09:22
Voq → Carlos_Mantos09:23
→ pbandark joined09:23
→ mosab joined09:24
→ Floflobel joined09:24
→ hightower4 joined09:24
← nimomo left09:24
hightower4 Hey, is there a way to only push to remote repository contents without the last e.g. 5 commits?09:25
→ aard joined09:25
i7c git push remote HEAD~5:remote-branch-name09:26
← _ADN_ left09:27
i7c or replace HEAD by any other ref09:27
← raz0r9 left09:27
hightower4 very magical!09:27
and many thanks09:28
i7c np :)09:28
← LiftLeft left09:30
→ SyntaxxxErr0r joined09:30
→ floppydh joined09:32
→ LiftLeft joined09:32
← netj left09:33
→ netj joined09:33
→ murii joined09:34
→ bolovanos joined09:35
→ Mike11 joined09:37
hightower4 Is there also a way to specify individual commits to be pushed?09:37
oxymoron93 you could create a branch consisting of specific commit, and push it afterwards09:37
commits*09:38
hightower4 mm right, ok thanks09:38
oxymoron93 using cherry-pick09:38
→ aax joined09:38
→ hightower2 joined09:39
← hightower2 left09:39
i7c hightower4, you cannot push a non-consecutive series of commits.09:39
You can cherry pick as oxymoron93 mentioned, but that actually makes it a "different" commit, because it is based on another parent afterwards.09:40
→ Matze202 joined09:41
← ghost43 left09:42
← hightower4 left09:42
→ LoggerZZZ joined09:42
→ finalbeta joined09:43
→ ghost43 joined09:43
→ _ADN_ joined09:43
← pnepe6 left09:44
← kurkale6ka left09:45
→ TomyWork joined09:45
← randomstrangerb left09:46
→ raz0r9 joined09:46
→ randomstrangerb joined09:46
→ Khatick joined09:47
← Khatick left09:48
← venmx left09:48
Carlos_Mantos → polyzen09:48
← goweol1 left09:48
← LoggerZZZ left09:49
→ venmx joined09:49
→ LoggerZZZ joined09:49
→ ok91 joined09:49
← LoggerZZZ left09:49
← raz0r9 left09:49
← mikemcowie left09:50
→ mchl_nix joined09:51
→ kurkale6ka joined09:53
gitinfo set mode: +v09:53
mchl_nix Hey, I was wondering, if the submodule commit I am using in a repo is also saved in the commits to that repo. Meaning, if I updated the submodules, with my latest commit to the parent repo, will past versions also now use that new version?09:53
tobiasvl mchl_nix: no09:53
→ raz0r9 joined09:53
mchl_nix Great. Thank you tobiasvl09:54
← Gotham25 left09:55
← LiftLeft left09:55
→ dhollin3 joined10:01
← dpyro left10:02
← robattila256 left10:02
← luckman212 left10:03
← Kaisyu left10:04
← dhollinger left10:04
← energizer left10:06
→ LoggerZZZ joined10:06
→ Cavallari joined10:07
→ luckman212 joined10:07
→ LiftLeft joined10:07
← rvgate left10:15
← yqt left10:15
← raz0r9 left10:15
← sostenuto left10:15
← Cabanossi left10:16
→ cstratak joined10:16
→ mrkake joined10:17
→ Mimicize joined10:18
← m1m3-50 left10:18
← bolovanos left10:18
→ sostenuto joined10:19
→ masuberu joined10:19
→ bolovanos joined10:21
→ YuGiOhJCJ joined10:23
→ raz0r9 joined10:24
← Mimicize left10:25
→ bouncy joined10:25
→ m1m3-50 joined10:26
→ rvgate joined10:27
← raz0r9 left10:30
→ nd joined10:30
← nd| left10:33
← kgrimes left10:33
← m1m3-50 left10:33
→ m1m3-50 joined10:34
→ manuelschneid3r joined10:36
← thican left10:38
→ Mimicize joined10:39
← uebera|| left10:40
← m1m3-50 left10:40
← LoggerZZZ left10:42
→ LoggerZZZ joined10:43
← LoggerZZZ left10:43
← tango_ left10:45
→ raz0r9 joined10:47
→ _joes_ joined10:47
← Mimicize left10:51
→ uebera|| joined10:51
→ m1m3-50 joined10:52
← tvw left10:52
→ tvw joined10:52
→ tango_ joined10:53
→ f2k joined10:54
← m1m3-50 left10:54
→ m1m3-50 joined10:54
← Cavallari left10:54
← bolovanos left10:58
→ robattila256 joined10:59
← borkr left11:00
→ bolovanos joined11:00
← m1m3-50 left11:01
← raz0r9 left11:02
→ m1m3-50 joined11:02
→ cek joined11:03
→ raz0r9 joined11:03
← nachoman left11:04
← m1m3-50 left11:05
→ m1m3-50 joined11:05
← raz0r9 left11:05
→ raz0r9 joined11:06
← muralisc left11:08
→ Trpger joined11:11
← Trpger left11:11
← madewokherd left11:11
→ plos joined11:13
→ LoggerZZZ joined11:14
← nowhere_man left11:14
← LoggerZZZ left11:15
→ LoggerZZZ joined11:18
← raz0r9 left11:18
→ nowhere_man joined11:19
→ raz0r9 joined11:20
← xcm left11:22
→ xcm joined11:22
→ jonno112 joined11:24
← raz0r9 left11:25
← abba left11:26
→ raz0r9 joined11:26
→ Gurkenglas joined11:26
→ leeN joined11:26
← Gurkenglas left11:28
→ Gurkenglas joined11:29
← raz0r9 left11:31
← nanga left11:34
→ eduardas_m joined11:35
→ nanga joined11:38
← nanga left11:38
→ nanga joined11:38
→ kus joined11:39
→ raz0r9 joined11:39
← kus left11:39
→ cfoch_ joined11:39
→ kus joined11:40
→ JeroenT joined11:41
→ jungsubk joined11:42
← raz0r9 left11:46
← mchl_nix left11:46
→ kbaegis joined11:47
← quite left11:47
→ abba joined11:48
← m1m3-50 left11:49
→ m1m3-50 joined11:50
→ plasticle joined11:50
← King_Hual left11:51
→ quite joined11:53
← bongjovi left11:53
→ simon816 joined11:55
← Mike11 left11:57
→ RougeR joined11:58
← deltam left12:00
← warthog9 left12:00
→ raz0r9 joined12:01
→ warthog9 joined12:01
← xqb left12:02
→ xqb joined12:03
← bolovanos left12:03
← raz0r9 left12:08
← xqb left12:10
← Andrew_K left12:10
← jast left12:11
← gitinfo left12:12
→ jast joined12:14
→ gitinfo joined12:15
ChanServ set mode: +o12:15
← mixaz left12:15
← infinisil left12:16
→ kgrimes joined12:17
→ infinisil joined12:19
← nasd4 left12:21
← weijin left12:21
McKraken_zzzzz → McKraken12:21
← kgrimes left12:22
← M6HZ left12:22
→ acidjnk joined12:24
acidjnk hello12:24
Can I see a quick diff for local changes which shows only REMOVED lines, not edited ones?12:24
← xcm left12:26
bremner acidjnk: see the --diff-filter argument to git-diff12:26
hmm. looking at the docs that's not exactly what i remember.12:27
→ xcm joined12:27
→ czart joined12:28
← jungsubk left12:29
oxymoron93 actually --diff-filter filters what files will be present after running git diff ? in respect to their status?12:30
← zulutango left12:32
← kbaegis left12:33
dcpc007 hi, how do you manage your ssh keys (work and home) for differents clients/appliances/sites/... ?12:34
→ deltam joined12:34
→ goatish joined12:35
→ muralisc joined12:37
→ weijin joined12:37
→ jimi_ joined12:38
→ kgrimes joined12:38
→ zombieleet joined12:39
→ ralpheeee joined12:41
← weijin left12:42
→ jstein_ joined12:42
jstein_ → jstein12:42
← njbair left12:43
→ njbair joined12:43
← kgrimes left12:43
→ weijin joined12:46
i7c What do you mean by "manage"?12:47
How to make git use key x for site y?12:48
← weijin left12:50
← Gurkenglas left12:53
moritz dcpc007: a sensible approach is to have different user accounts on you machine for private and work stuff12:53
dcpc007: and then it's easy to give 'em separate ssh keys12:54
→ dave0x6d joined12:54
→ [Brain] joined12:54
dcpc007 it's from different machines12:55
this morning i would make a demo with github, and find boring to create a new ssh key each time i switch computer12:56
(and more, i need to delete them after if no more need)12:56
and myabe severals ones ... because i think i'll use different keys for different product (like one for ssh to computer, one for ithub.com, one for a local gitlab CE)12:57
→ JeroenT_ joined12:58
dcpc007 then need to create for me at home 3 keys (i can rename them locally to remember which one is for)12:58
← JeroenT_ left12:58
← JeroenT left12:58
dcpc007 but then i have a laptop too at home ... feel boring to create another 3 keys and add to all applictions12:58
or is it the recommanded method ?12:58
→ mixaz joined12:58
→ JeroenT joined12:59
dcpc007 in github i already add 2 keys to access my account (home and work key)12:59
← plos left12:59
→ weijin joined13:00
moritz I tend to have one ssh key per (machine, account) pair13:00
canton7 the general approach is that your key represents you. You have a single key (or maybe one for work and one for home, representing your two personas). You then give your public key to everything you want access to.13:00
dcpc007 if i want to access my github.com repo from another computer (monday i make a demo of web UI git management), should i create another ssh key, rename upload it, and after i delete locally + on github ?)13:00
← [Brain] left13:00
dcpc007 ha ok you use the same key for all services13:01
but one key / hardware13:01
one source key13:01
→ bolovanos joined13:01
dcpc007 i've the same "problem" at work where i take the network ssh key from users (linux home in in NFS ... then no "hardware linked" key) and copy/convert on their windows laptop to use with git clients or putty13:02
(putty-agent can't read id_rsa, need to convert/generate in ppk format)13:03
→ raz0r9 joined13:03
dcpc007 10years i use ssh, but never had those needs :)13:03
← weijin left13:04
← finalbeta left13:04
→ finalbeta joined13:05
← Trieste left13:05
→ Trieste joined13:07
← raz0r9 left13:07
← dino82 left13:08
← Murr left13:08
→ Murr joined13:08
→ M6HZ joined13:10
→ xqb joined13:10
→ synthroid joined13:12
← ogny left13:14
← murii left13:15
→ jalspons joined13:15
← xcm left13:16
← jonno112 left13:16
→ xcm joined13:16
→ weijin joined13:17
→ tsarenkotxt joined13:17
← finalbeta left13:17
← tvw left13:17
← tsarenkotxt left13:18
→ hugdru joined13:19
→ pgupta joined13:19
→ bsanford joined13:20
← bolovanos left13:21
→ bolovanos_ joined13:21
← weijin left13:21
→ olbat joined13:24
olbat vvnhjlfhnnfhvnflgujlbfldbldgljcgrjjhgfnhhtnj13:24
pandem1 hello olbat13:24
← amosbird left13:24
→ finalbeta joined13:24
olbat oops sorry for that :) Hello !13:25
→ Tobbi joined13:27
← xcm left13:28
→ xcm joined13:28
→ amosbird joined13:29
← kurkale6ka left13:29
← muralisc left13:31
← aard left13:32
→ muralisc joined13:32
← jstein left13:33
← kier left13:34
→ aard joined13:35
→ kier joined13:35
← njbair left13:36
→ njbair joined13:37
→ kurkale6ka joined13:38
→ kpease joined13:40
← xcm left13:41
→ xcm joined13:42
→ weijin joined13:46
→ djb-irc joined13:47
← weijin left13:51
← AfroThundr left13:52
→ Achylles joined13:55
→ banisterfiend joined13:55
→ cdg joined13:56
→ staafl joined13:56
→ raz0r9 joined13:57
← staafl_ left13:59
← ok91 left13:59
← phinxy left14:00
→ Amanas joined14:00
← Achylles left14:00
← m1m3-50 left14:01
→ m1m3-50 joined14:02
→ meakawa joined14:03
→ cdg_ joined14:03
→ Masber_080 joined14:03
→ weijin joined14:03
→ jonno112 joined14:04
← skered left14:06
← nowhere_man left14:06
→ nowhereman_ joined14:06
← cdg left14:07
← masuberu left14:07
← weijin left14:07
← ndim left14:08
← Matze202 left14:09
→ odigem joined14:09
odigem Hi14:09
have way add submodule to project without cloning it here?14:10
← disi left14:10
→ disi joined14:11
← LoggerZZZ left14:12
→ LoggerZZZ joined14:14
bolovanos_ → bolovanos14:16
← cur8or left14:17
← cfoch_ left14:19
← bolovanos left14:19
moritz odigem: sounds doable but quite complicated14:19
why do you need that?14:19
→ relipse joined14:20
odigem why i must run pull requests on my local machine?14:20
and push everytime14:20
← raz0r9 left14:20
→ raz0r9 joined14:21
→ relipse__ joined14:23
→ bolovanos joined14:24
← relipse left14:24
← Masber_080 left14:25
← raz0r9 left14:25
← muralisc left14:25
→ re1 joined14:25
← re1 left14:25
→ masuberu joined14:26
→ phinxy joined14:26
→ muralisc joined14:26
→ kgrimes joined14:26
← chaosruler left14:27
→ chaosruler joined14:27
← muralisc left14:27
← LoggerZZZ left14:28
→ muralisc joined14:28
→ ndim joined14:28
← kurkale6ka left14:28
→ raz0r9 joined14:28
← aard left14:29
→ kurkale6ka joined14:29
← raz0r9 left14:29
→ LoggerZZZ joined14:29
→ raz0r9 joined14:29
← muralisc left14:29
→ muralisc joined14:30
→ skered joined14:30
→ sammyg joined14:30
← imack left14:31
→ aard joined14:31
← kgrimes left14:31
← raz0r9 left14:31
→ raz0r9 joined14:33
→ DanielKarp joined14:34
→ weijin joined14:36
→ shinnya joined14:38
→ Mike11 joined14:39
Mike11 Hello all :)14:39
what is usually meant by doing a "downmerge"?14:40
← weijin left14:40
← LoggerZZZ left14:41
→ mattmccarty_ joined14:41
→ LoggerZZZ joined14:42
← oxymoron93 left14:42
← ascheel left14:43
← netj left14:45
← meakawa left14:45
→ netj joined14:46
← muralisc left14:47
→ muralisc joined14:47
← muralisc left14:48
← zombieleet left14:48
→ Noldorin joined14:48
→ psidium joined14:49
← raz0r9 left14:49
← jimi_ left14:51
→ dino82 joined14:51
gitinfo set mode: +v14:54
psidium Hello! I was the middle of a big rebase and I executed `git rebase --skip` instead of `git rebase --continue`. I fixed that by tinkering inside the `.git/rebase-apply` folder.14:54
I wonder, would the addition of a `git rebase --undo-skip` be a useful addition to the command line? If so, would that be a good first patch for a non-git developer?14:54
→ muralisc joined14:54
← muralisc left14:55
→ boombatower joined14:55
→ stutter_ joined14:55
→ raz0r9 joined14:56
→ muralisc joined14:56
← abba left14:58
→ cdg joined14:59
← cdg left15:01
→ cdg joined15:02
← cdg left15:02
→ cdg joined15:02
← cdg_ left15:02
← flaviodesousa left15:02
→ cdg_ joined15:03
← dave0x6d left15:03
← YuGiOhJCJ left15:05
← ralpheeee left15:06
→ greggerz joined15:06
← squirrel left15:06
← raz0r9 left15:06
← cdg left15:07
← floppydh left15:08
→ re1 joined15:09
→ weijin joined15:11
→ sarp joined15:11
← muralisc left15:13
← nerdinja left15:13
→ muralisc joined15:13
← Adoray` left15:14
← muralisc left15:14
→ muralisc joined15:14
→ squirrel joined15:14
← muralisc left15:14
→ muralisc joined15:15
← muralisc left15:15
→ muralisc joined15:15
→ azur_kind joined15:16
← hugdru left15:17
→ kbaegis joined15:18
← weijin left15:20
→ introom2 joined15:21
← chachasmooth_ left15:21
→ chachasmooth joined15:21
← TomyWork left15:24
← sammyg left15:25
← JeroenT left15:28
← kbaegis left15:28
← widp left15:28
→ dendazen joined15:28
← LoggerZZZ left15:29
→ LoggerZZZ joined15:30
→ nosmelc joined15:32
→ MarioBranco joined15:32
→ jready joined15:32
→ s0b_ joined15:32
→ nerdinja joined15:33
← cdown left15:33
← ZexaronS left15:34
← muralisc left15:34
→ muralisc joined15:35
← azur_kind left15:39
← sarp left15:40
← muralisc left15:40
→ iNCoNFuN joined15:40
→ muralisc joined15:41
← pgupta left15:41
→ flobin joined15:42
flobin hi everyone, I’m trying to set up a git repo on a VPS, so I followed this tutorial15:43
https://www.digitalocean.com/community/tutorials/how-to-set-up-automatic-deployment-with-git-with-a-vps15:43
all seems to have gone well, but when I look in the folder where my files are supposed to be, it’s empty15:44
← jready left15:45
flobin anyone know why that might happen?15:46
← mel00010 left15:46
→ skinux joined15:46
skinux Is there a way to get git to automatically roll-up version number on each push?15:46
I mean, each commit15:46
Right now, I would have to manually create a branch including version number.15:47
← muralisc left15:47
→ muelleme joined15:48
← re1 left15:48
→ re1 joined15:49
← diogenese left15:50
grawity no, there isn't15:50
use `git describe`15:50
→ diogenese joined15:50
→ weijin joined15:50
→ thiago joined15:51
→ Masber_080 joined15:51
→ DammitJim joined15:51
← re1 left15:51
→ Raed|Laptop joined15:51
→ mel00010 joined15:51
DammitJim I would like to create a remote repository for a project15:51
→ yourname_ joined15:51
DammitJim I already have a different server with git and some repos in there15:51
I just don't remember the right way of doing this15:51
→ re1 joined15:51
DammitJim what would you suggest I do first?15:51
I created the repo on the remote server15:52
(bare)15:52
do I just need to go to the server with the project and do: git remote add origin <remote repository URL> ?15:52
kadoban skinux: If your version numbers suck, like if they're just the number of commits, then on build just have it created and inserted (probably include the commit hash or describe output as well as the number of commits). If they're more interesting, git wouldn't be able to figure them out anyway so you'll have to do them manually.15:52
→ muralisc joined15:52
← re1 left15:53
skinux Hmm. Maybe there is a front-end script written by someone.15:53
← muelleme left15:53
→ eivarv joined15:53
skinux Well, for now I can just create a new branch for every commit that I want to have it's own version number.15:54
that' git checkout -b branch-name right?15:54
← masuberu left15:54
bremner do you need a branch? a tag would be more typical15:54
← weijin left15:54
bremner unless you plan to continue developing on that branch15:55
→ r4nd0m-0ne joined15:55
skinux Well, if I just tag, then if I want to pull the previous state of files it won't exist.15:55
← psidium left15:56
skinux Or would it track the changes by tag?15:56
← nerdinja left15:57
→ nerdinja joined15:57
← f2k left15:57
← manuelschneid3r left15:57
grawity both tags and branches eventually just point to a commit15:58
and having a commit means you always have all the historical commits that lead up to it15:58
← muralisc left15:58
← yourname_ left15:59
→ muralisc joined16:00
→ cdg joined16:02
→ raz0r9 joined16:02
← stutter_ left16:04
← muralisc left16:04
→ crose joined16:04
← _ADN_ left16:04
← ertes-w left16:04
→ muralisc joined16:04
→ _ADN_ joined16:05
→ TomyLobo joined16:05
← cdg_ left16:06
← eivarv left16:06
← raz0r9 left16:06
← cdg left16:06
→ eivarv joined16:08
← introom2 left16:10
→ cdg joined16:10
→ cdg_ joined16:11
← Strykyr left16:12
→ Strykyr joined16:12
→ syntaxxx_err joined16:12
dhollin3 → dhollinger16:12
← flobin left16:12
→ Matze202 joined16:13
← SyntaxxxErr0r left16:13
→ xfbs joined16:14
→ syntaxxx__err_0r joined16:14
→ kgrimes joined16:15
← cdg left16:15
→ cust joined16:15
→ stutter_ joined16:16
→ Adoray joined16:16
← syntaxxx_err left16:17
← xqb left16:17
→ xqb joined16:18
← LoggerZZZ left16:20
← kgrimes left16:20
→ LoggerZZZ joined16:21
→ weijin joined16:21
→ ok91 joined16:23
← shinnya left16:23
← muralisc left16:23
← kurkale6ka left16:23
→ muralisc joined16:24
→ borkr joined16:24
→ kurkale6ka joined16:24
→ jimi_ joined16:25
← thiago left16:25
→ nowhere_man joined16:25
← weijin left16:25
← muralisc left16:26
→ belmoussaoui joined16:27
→ GoBear joined16:27
→ jimi_sanchez joined16:27
→ masuberu joined16:28
DammitJim I just did a git push origin master and the last line it printed was: Total 114 (delta 43), reuse 0 (delta 0)16:29
← nowhereman_ left16:29
DammitJim but it hasn't returned :(16:29
← jimi_ left16:29
← synthroid left16:30
kadoban DammitJim: Are there server side hooks?16:30
→ akushner joined16:30
kadoban I think that's about where they'd run, the post-receive ? one16:30
→ phluks joined16:31
DammitJim server side hooks? not sure what those are, so probably not16:31
kadoban The server side is something you set up then?16:31
→ sammyg joined16:31
DammitJim I set up the server and the client, yes16:31
kadoban Hm, ya you'd know then. Uhmmmm16:31
DammitJim I see the hooks directory on the git remote server in the repo I was working on, but the files all end in .sample16:31
← masuberu left16:31
→ manuelschneid3r joined16:32
→ manuels joined16:32
→ manuels_ joined16:32
kadoban I think something like 'git gc' might also go on somewhere around that time? I'm not sure what else would be happening16:32
← Masber_080 left16:32
kadoban Could be wrong about that part too16:32
→ weijin joined16:32
DammitJim kadoban, when I set up the remote16:32
→ pirocks joined16:33
DammitJim I put: git remote add origin ssh://<server>/repository16:33
what if I wanted to use a different ssh user to check in stuff?16:33
→ masuberu joined16:33
grawity ssh://<user>@<server>/<repository>16:33
→ dreiss joined16:34
kadoban DammitJim: The URL format I usually use for git repos is just user@server:blah/stuff16:34
Or yeah that16:34
For git repos via ssh I meant16:34
DammitJim how do I change the remote?16:34
since I already did: git remote add origin?16:34
kadoban git remote set-url origin whatever or something like that16:34
← crose left16:34
DammitJim ok, that was it!16:35
thanks man16:35
→ HolodocPrime joined16:35
← chele left16:36
← holodoc left16:36
← weijin left16:37
← robattila256 left16:39
← masuberu left16:40
← s0b_ left16:40
→ kgrimes joined16:40
→ Masterphi joined16:42
DammitJim simplest question16:43
say I make a change to a file that has been checked in16:44
how do I check it out from the repo16:44
to go back to where I was?16:44
grawity git checkout <filename>16:44
→ Kira joined16:44
grawity optionally git checkout -f <filename>16:44
I don't remember when the -f is required16:44
DammitJim thanks16:45
grawity actually maybe it's only needed when no filenames are specified16:45
DammitJim no problem... I'm just looking at 1 file at this time16:45
← dmone left16:45
DammitJim so, let's say I check in a bad file to my local repo16:45
and I then check it in to my remote repo16:46
→ crose joined16:46
DammitJim does one normally check out the "good" file (previous version) from the local repo16:46
then fix it, then commit it to the local repo16:46
← kgrimes left16:46
DammitJim and then push it to the remote?16:46
I guess there are different ways to do this16:46
← crose left16:47
← k_sze[work] left16:47
→ synthroid joined16:47
→ AaronMT joined16:48
→ muelleme joined16:49
→ synthroi_ joined16:50
← manuelschneid3r left16:51
← manuels_ left16:51
← manuels left16:51
→ manuelschneid3r joined16:51
← syntaxxx__err_0r left16:52
← kpease left16:52
→ syntaxxx__err_0r joined16:52
→ alezandro joined16:53
→ kpease joined16:53
← synthroid left16:53
← muelleme left16:54
← Masterphi left16:55
→ raz0r9 joined16:58
← aielima left17:00
→ Masterphi joined17:01
→ weijin joined17:02
→ raynold joined17:02
← mikecmpbll left17:03
→ synthroid joined17:03
← LoggerZZZ left17:04
→ LoggerZZZ joined17:05
Trel If I did a git clone, is there any way to pull in the same files I got from the original clone?17:05
→ Mimicize joined17:06
← weijin left17:07
← squirrel left17:07
→ dviola joined17:07
← synthroi_ left17:07
← Murr left17:08
nosmelc Trel, yes. You can create a remote for the original clone17:08
→ Murr joined17:08
→ robattila256 joined17:08
← eduardas_m left17:09
→ l0x0304 joined17:09
Trel I'm not too familiar with that, do you happen to know of an article that explains doing that?17:09
nosmelc Trel, https://help.github.com/articles/configuring-a-remote-for-a-fork/17:09
← m1m3-50 left17:09
nosmelc Trel, this is more about synching changes from an original repo after forking it, but it still applies to your situation17:10
Trel Oh, that's not what I meant17:10
I mean the specific commit it was at when I did the clone17:11
← njbair left17:11
→ njbair joined17:11
→ madewokherd joined17:12
← l0x0304 left17:13
→ Research joined17:14
Research Is there a way to do essentially the same as git clone --depth 1 in an already cloned git repository ?17:14
← LoggerZZZ left17:15
→ [Brain] joined17:15
→ LoggerZZZ joined17:16
→ dave0x6d joined17:16
← wandering_vagran left17:19
→ mikecmpbll joined17:19
← kpease left17:19
THC → stoned17:22
← jonno112 left17:23
→ kpease joined17:25
amosbird Hello, how can I retrieve last 1000 commits ?17:25
→ orbyt_ joined17:26
Research depends on what you mean by "retrieve"17:26
clone, cherrypick, log ?17:26
Trel nosmelc: I think I'm just for this purposes going to add a remote, and do a fetch and reset for the commit it was at when I cloned the first one17:27
→ weijin joined17:28
← dreiss left17:29
← diogenese left17:30
← xcm left17:30
→ xcm joined17:31
→ jnavila joined17:32
→ diogenese joined17:33
→ ProfMac joined17:34
← kurkale6ka left17:36
→ nephyrin joined17:36
← weijin left17:37
→ durham joined17:38
← jimi_sanchez left17:39
← randomstrangerb left17:39
→ randomstrangerb joined17:39
← _ADN_ left17:39
→ jesst joined17:40
← jesst left17:41
← minionofgozer left17:41
→ tvw joined17:42
→ EvilPenguin joined17:42
→ chaosruler_ joined17:43
← chaosruler left17:43
→ Darcidride_ joined17:43
← DaGoaty left17:45
→ DaGoaty joined17:45
← DaGoaty left17:46
← mosab left17:46
→ DaGoaty joined17:46
← DaGoaty left17:46
→ DaGoaty joined17:47
← DaGoaty left17:47
→ DaGoaty joined17:47
← Darcidride_ left17:48
← LoggerZZZ left17:48
← DaGoaty left17:48
→ DaGoaty joined17:48
← borkr left17:49
← DaGoaty left17:49
→ LoggerZZZ joined17:49
→ DaGoaty joined17:49
← DaGoaty left17:50
← sarri left17:50
→ Darcidride_ joined17:51
→ jimmyrcom joined17:51
← nerdinja left17:52
→ d10n-work joined17:54
→ kerrick joined17:54
→ cdg joined17:56
← iNCoNFuN left17:57
→ sanscoeur joined17:57
→ SteffanW joined17:58
← spicerack left17:58
← doug16k left17:59
← cdg_ left17:59
→ muelleme joined18:00
← cdg left18:00
→ doug16k joined18:01
aax → xaa18:01
→ Mike111 joined18:03
→ cdg joined18:04
← Floflobel left18:04
→ bumblebeer joined18:04
← Mike11 left18:05
← jnavila left18:05
← GoBear left18:06
→ Pacra joined18:06
→ weijin joined18:06
← Mike111 left18:07
→ GoBear joined18:08
→ sleepingforest joined18:08
→ ralpheeee joined18:08
← tvw left18:09
→ jready joined18:10
← weijin left18:11
→ d[10] joined18:11
d[10] Git is uploading .zip file that does not exist, how to remove it18:11
→ energizer joined18:11
→ Gurkenglas joined18:12
← cstratak left18:12
← Matze202 left18:12
→ frederfred joined18:13
→ Barrt joined18:13
→ jnavila joined18:14
← syntaxxx__err_0r left18:14
→ weijin joined18:15
→ syntaxxx__err_0r joined18:15
→ zombieleet joined18:16
→ Praxi joined18:17
← MarioBranco left18:18
← SteffanW left18:18
← belmoussaoui left18:18
→ dpyro joined18:18
→ SteffanW2 joined18:18
← synthroid left18:19
← weijin left18:20
→ belmoussaoui joined18:20
→ sleepingdeforest joined18:20
← belmoussaoui left18:20
→ MarioBranco joined18:21
← Raging_Hog left18:23
← sleepingforest left18:23
→ fekir joined18:25
→ jottr joined18:26
← phluks left18:27
→ kgrimes joined18:29
→ Matze202 joined18:30
→ phluks joined18:32
bremner uh. git doesn't upload files.18:32
perhaps you could rephrase your question.18:33
→ thiago joined18:33
← venmx left18:33
← kgrimes left18:34
→ synthroid joined18:35
→ venmx joined18:35
← Pacra left18:36
Hello71 probably deleted large file in new commit18:37
← MrBiogene left18:39
← muelleme left18:40
← enelar left18:40
→ enelar joined18:41
→ weijin joined18:41
→ zzz joined18:41
← Gurkenglas left18:42
→ rory joined18:43
→ kgrimes joined18:45
→ MrBiogene joined18:45
← weijin left18:45
lebster_ → lebster18:45
→ SlashLife joined18:45
→ weijin joined18:46
← jottr left18:46
← LoggerZZZ left18:48
← SlashLife left18:49
→ SlashLife joined18:49
→ LoggerZZZ joined18:49
← phluks left18:50
← Research left18:50
← banisterfiend left18:50
← weijin left18:50
← kgrimes left18:50
← venmx left18:50
→ jottr joined18:52
→ piggah joined18:53
→ aananev joined18:53
← manuelschneid3r left18:54
→ GreenJello joined18:55
← ralpheeee left18:55
→ dermoth_ joined18:55
← dermoth left18:55
← SlashLife left18:55
→ SlashLife joined18:55
dermoth_ → dermoth18:55
→ coumbole joined18:56
GreenJello hey, so I have two branches that have diverged a lot. I'd like to somehow merge only changes to one directory back into master. The main directories are 'client' and 'server'. There may be some commits that touch both, and I'd still only like the changes to files in client. Is this possible?18:56
I'll eventually merge everything back into master18:57
The branch actually has all of the commits in master, so not really diverged18:58
← piggah left18:58
→ ePirat joined18:58
→ Br4ins joined19:00
← jottr left19:01
← syntaxxx__err_0r left19:02
← akushner left19:02
→ syntaxxx__err_0r joined19:02
→ akushner joined19:02
← kadoban left19:02
← cyberz left19:03
← coumbole left19:05
← jimmyrcom left19:05
← lempamo left19:05
→ muelleme joined19:07
← evil-god left19:09
→ Cabanossi joined19:10
← xcm left19:11
→ xcm joined19:11
← bket left19:13
→ bket joined19:14
← dendazen left19:15
← dermoth left19:15
← syntaxxx__err_0r left19:16
→ syntaxxx__err_0r joined19:16
→ dermoth joined19:16
← jacobat left19:17
← preaction left19:17
← muelleme left19:19
← Raed|Laptop left19:20
→ m1m3-50 joined19:21
→ Sasazuka joined19:23
→ weijin joined19:23
← LoggerZZZ left19:24
← Mimicize left19:24
→ LoggerZZZ joined19:25
→ preaction joined19:25
← disi left19:26
← dave0x6d left19:26
→ ocds joined19:26
← enelar left19:26
→ enelar joined19:27
← weijin left19:27
→ disi joined19:27
← goatish left19:28
→ jacobat joined19:30
← zzz left19:30
← LocaMocha left19:31
→ jottr joined19:32
→ rkta joined19:32
→ jimmyrcom joined19:35
← cdg left19:35
← jimmyrcom left19:36
→ jimmyrcom joined19:37
← jottr left19:37
→ King_Hual joined19:37
← King_Hual left19:37
→ King_Hual joined19:37
← m1m3-50 left19:38
→ m1m3-50 joined19:38
→ zzz joined19:38
← jimmyrcom left19:40
← pirocks left19:40
→ jimmyrcom joined19:41
→ mizu_no__ joined19:41
→ banisterfiend joined19:41
→ fstd_ joined19:42
→ jottr joined19:43
← banisterfiend left19:44
← fstd left19:45
fstd_ → fstd19:45
← Masterphi left19:46
→ Criminet joined19:46
← fekir left19:47
→ carissimo joined19:47
→ hahuang65 joined19:47
← syntaxxx__err_0r left19:48
→ syntaxxx__err_0r joined19:48
→ catch22 joined19:49
← d[10] left19:50
→ weijin joined19:53
→ nerdinja joined19:54
→ user2468 joined19:54
xqb how can I go back to previous version of my app19:54
the changes I made don't work19:55
and I now want to get the previous version back19:55
on my computer19:55
← zombieleet left19:55
blackbeard420 xqb: checkout the previous commit that worked19:55
xqb how to do that?19:56
→ _ADN_ joined19:57
← weijin left19:57
xqb I want to go back to this https://github.com/xqb2/pong/commit/9eb192e942462f2200b6255f4c58029ea285a18e19:57
to that state19:57
when I commited that19:57
→ ralpheeee joined19:59
← zzz left20:00
← randomstrangerb left20:00
← pbandark left20:00
→ randomstrangerb joined20:01
← jottr left20:02
← Anthaas left20:03
→ zzz joined20:03
→ muelleme joined20:04
← kerrick left20:05
← DanielKarp left20:05
← mixaz left20:05
← zzz left20:06
← skinux left20:06
→ kgrimes joined20:06
→ skinux joined20:06
← skinux left20:06
→ skinux joined20:06
→ Anthaas joined20:06
→ mikemcowie joined20:07
→ zombieleet joined20:09
→ DanielKarp joined20:09
← black_13 left20:10
← kgrimes left20:11
→ flobin joined20:11
flobin so I’ve set up a vps to receive my git repo and it looks like pushing the repo goes well, but when I look, no files are there… why could that be?20:13
→ banisterfiend joined20:13
← kini left20:14
→ troulouliou_div2 joined20:14
grawity repos come in two types – the ones you push to are "bare" repositories, and their only purpose is to store the Git history database, not to work with the files directly20:14
so they do not have a working tree20:14
← LoggerZZZ left20:14
grawity if you do need to work on the server directly, clone the bare repo there as well20:15
→ LoggerZZZ joined20:16
← SteffanW2 left20:16
flobin grawity: oh yeah I probably should have mentioned I followed this guide https://www.digitalocean.com/community/tutorials/how-to-set-up-automatic-deployment-with-git-with-a-vps20:17
→ ZyX-I joined20:18
← nanga left20:18
→ zzz joined20:19
→ Pacra joined20:19
← raz0r9 left20:19
→ borkr joined20:19
→ nanga joined20:20
← nanga left20:20
→ nanga joined20:20
← zzz left20:20
flobin grawity: so I have a bare repo on the vps but it should transfer the actual files also20:20
grawity which directory are you looking in?20:20
→ kerrick joined20:21
← banisterfiend left20:22
→ raz0r9 joined20:22
→ kini joined20:23
→ coumbole joined20:23
← randomstrangerb left20:24
flobin grawity: so I set up the bare git repo in /var/repo/site.git20:24
← raz0r9 left20:24
flobin and I set up the work-tree in /var/www/davlstudio.com/html/20:24
that last dir is empty20:24
→ randomstrangerb joined20:24
→ raz0r9 joined20:24
← raz0r9 left20:24
→ kgrimes joined20:25
→ weijin joined20:25
→ hugdru joined20:26
→ banisterfiend joined20:28
← DanielKarp left20:29
→ evil-god joined20:29
← weijin left20:30
← kgrimes left20:30
→ Mike11 joined20:34
→ kgrimes joined20:34
→ DanielKarp joined20:35
← kgrimes left20:36
→ kgrimes joined20:37
← borkr left20:37
→ weijin joined20:39
→ phluks joined20:40
← banisterfiend left20:40
→ raz0r9 joined20:41
→ Raed|Laptop joined20:41
→ mikedd joined20:41
→ banisterfiend joined20:44
← weijin left20:44
← raz0r9 left20:45
→ rkd joined20:45
→ raz0r9 joined20:46
→ cdg joined20:46
← alezandro left20:48
← banisterfiend left20:48
← sammyg left20:49
→ aielima joined20:49
← Mike11 left20:50
← cdg left20:50
→ banisterfiend joined20:51
← banisterfiend left20:51
McKraken → McKraken_zzzzz20:51
← zombieleet left20:52
→ banisterfiend joined20:52
→ venmx joined20:52
← dmarr left20:53
→ dmarr joined20:54
← orbyt_ left20:57
← chaosruler_ left20:58
→ chaosruler_ joined20:58
← kus left21:00
→ weijin joined21:01
← rkd left21:02
← xaa left21:02
← chaosruler_ left21:02
→ rkd joined21:02
→ chaosruler_ joined21:03
tobiasvl I don't remember how it works, but did you do an explicit checkout?21:03
← mizu_no__ left21:03
→ m0viefreak joined21:06
← weijin left21:06
→ orbyt_ joined21:06
← phluks left21:08
← nowhere_man left21:09
→ phluks joined21:10
← MarioBranco left21:11
← mel00010 left21:11
← banisterfiend left21:12
→ weijin joined21:14
← Raed|Laptop left21:15
← jready left21:15
← LoggerZZZ left21:16
→ banisterfiend joined21:16
→ LoggerZZZ joined21:17
← raz0r9 left21:17
← weijin left21:18
← frederfred left21:18
← banisterfiend left21:19
→ borkr joined21:19
→ banisterfiend joined21:20
→ pirocks joined21:21
← banisterfiend left21:21
→ phluks_ joined21:22
→ cdg joined21:23
→ banisterfiend joined21:23
← phluks left21:24
← dermoth left21:24
→ mel00010 joined21:24
← moei left21:24
← cdg left21:24
→ dermoth joined21:25
→ moei joined21:25
→ cdg joined21:25
← ocds left21:25
→ sammyg joined21:25
← bumblebeer left21:26
← banisterfiend left21:27
→ r00t66 joined21:28
← westies left21:28
→ xaa joined21:29
→ banisterfiend joined21:30
→ alezandro joined21:30
→ marlun joined21:31
marlun Is it new that git shows `git branch` inside a pager even if it's just like 6 branches? I can't remember that happend before?21:32
→ shodan` joined21:32
→ jready joined21:33
Seveas yeah, that seems new. 2.14.3 doesn't do that for me, but 2.15.1+next does21:34
← shodan` left21:35
← eivarv left21:36
→ raz0r9 joined21:37
← aard left21:38
Seveas doing a bisect to figure out when it changed21:38
← chaosruler_ left21:39
← jready left21:39
← r00t66 left21:40
← Criminet left21:41
← banisterfiend left21:41
→ mixaz joined21:41
→ Criminet joined21:41
→ guest8631 joined21:42
→ piggah joined21:44
← jnavila left21:44
Seveas [0ae19de74f6f5d6c6f9c80899e1ecd611c5b9827] branch: change default of `pager.branch` to "on"21:45
← jcarpenter2 left21:46
← raz0r9 left21:46
Seveas which is in 2.16.021:46
→ zzz joined21:46
→ cdown joined21:47
→ phluks joined21:47
← phluks_ left21:48
← synthroid left21:48
← sleepingdeforest left21:50
raynold ahh it's a wonderful day21:50
→ eivarv joined21:51
→ goatish joined21:52
→ weijin joined21:52
→ dave0x6d joined21:52
→ raz0r9 joined21:53
← guest8631 left21:53
→ LichtMacher joined21:53
→ jready joined21:54
→ banisterfiend joined21:55
← zarzar1 left21:56
marlun Seveas: ah, thanks!21:56
← alyptik left21:56
← xcm left21:57
← afuentes left21:57
→ xcm joined21:57
← weijin left21:57
← schleppel left21:58
← raz0r9 left21:58
→ raz0r9 joined21:58
→ alyptik joined21:59
→ jnavila joined22:00
→ v4ult joined22:01
← venmx left22:02
→ weijin joined22:06
← xcm left22:06
zzz → dskljfhsalkdfjha22:07
dskljfhsalkdfjha → dskljfhsalkdfjhx22:07
dskljfhsalkdfjhx → gfskljfhsalkdfjh22:08
← peepsalot left22:08
← banisterfiend left22:08
← rkd left22:08
← ghost43 left22:09
→ ghost43 joined22:10
→ rkd joined22:10
gfskljfhsalkdfjh → z0_22:10
→ barduck joined22:10
→ xcm joined22:10
← weijin left22:10
z0_ → z022:10
z0 → zzz22:11
← zzz left22:11
→ banisterfiend joined22:11
→ jimi_ joined22:12
→ bumblebeer joined22:12
← jimi_ left22:13
← LoggerZZZ left22:14
← syntaxxx__err_0r left22:14
→ syntaxxx__err_0r joined22:14
← cdg left22:15
→ LoggerZZZ joined22:15
→ shodan` joined22:15
→ peepsalot joined22:16
← LoggerZZZ left22:16
→ Masterphi joined22:16
→ phluks_ joined22:17
← phluks left22:18
← jready left22:18
McKraken_zzzzz → McKraken22:19
← rkd left22:19
← enelar left22:19
← stutter_ left22:20
→ rkd joined22:22
← phluks_ left22:22
← ePirat left22:22
← rkd left22:22
← mooasaurus left22:23
→ phluks_ joined22:23
→ mooasaurus joined22:23
→ kadoban joined22:24
→ zzz joined22:25
→ mizu_no__ joined22:26
→ weijin joined22:27
← Adoray left22:28
McKraken → McKraken_zzzzz22:30
← phluks_ left22:30
← jnavila left22:30
→ jready joined22:30
→ phluks_ joined22:31
← ok91 left22:31
← weijin left22:31
← shodan` left22:31
← mizu_no__ left22:32
→ shodan` joined22:33
← catch22 left22:33
← banisterfiend left22:33
← shodan` left22:34
→ venmx joined22:34
→ mizu_no__ joined22:34
→ jcarpenter2 joined22:34
← notnull left22:35
← jready left22:35
→ mrproper joined22:36
mrproper If I forked a project in github and did a pull request from it, should I fork it again to do another pull request? Or is there a way for me to fast forward it to the latest revision and use the same fork?22:36
← DanielKarp left22:36
oprypin mrproper, dont fork again and dont clone again22:37
mrproper oprypin: How do I get it updated to the latest and greatest?22:37
oprypin mrproper, could you show the output of `git remote -v`22:37
mrproper oprypin: I’m in the github interface right now. There’s no way to do it in there?22:37
oprypin mrproper, have you ever used a terminal for this/22:38
mrproper oprypin: Not for this particular function, no.22:38
oprypin then for which function?22:38
→ banisterfiend joined22:38
mrproper Typical branch work and whatnot.22:38
← hugdru left22:39
mrproper oprypin: https://paste.ee/p/W4oJi22:39
oprypin ok well. this "fork" stuff on github is a mess and you shouldn't care about what your fork looks like in the UI22:39
mrproper oprypin: Interesting. Okay.22:39
← mizu_no__ left22:39
oprypin i'd just do `git fetch` `git checkout -b new-feature upstream/master`22:40
or maybe it's upstream/devel in this case22:40
you just get a new up-to-date branch22:40
→ catch22 joined22:41
mrproper Okay cool. Thanks!22:41
oprypin: So the fork stuff in github is weird?22:41
oprypin I would say so22:41
← banisterfiend left22:42
oprypin basically your fork is doomed to being outdated unless you manually push to it all the time22:42
just forget about it, do all work based on the actual repo, and just push branches to the fork for the purposes of pull requests22:42
→ rkd joined22:43
oprypin that's why i also use "origin" and "fork" instead of "upstream" and "origin" for remote names22:43
→ weijin joined22:44
mrproper Makes sense, thanks!!!22:44
oprypin because if the actual repo is the primary remote then you can do nice things like `git pull` and it will actually work22:44
mrproper Yeah, git pull seems to not be a thing in the fork.22:44
oprypin well you're up to date with the outdated fork22:45
i `git clone` the original and `git remote add fork https://github.com/kbreit/ansible` (substituting with yout example)22:45
→ banisterfiend joined22:46
→ jimi_ joined22:46
→ masuberu joined22:46
← weijin left22:48
← dege left22:48
← phluks_ left22:51
← mixaz left22:55
→ phluks joined22:57
← DammitJim left22:57
← AaronMT left22:58
→ lounge-user25 joined22:59
← lounge-user25 left23:00
← raz0r9 left23:00
← bumblebeer left23:00
→ jottr joined23:01
→ DaGoaty joined23:02
→ zulutango joined23:02
← phluks left23:03
← mrproper left23:04
→ weijin joined23:04
→ AfroThundr joined23:05
← relipse__ left23:06
← watabou left23:06
← DaGoaty left23:07
→ phluks joined23:08
→ Raed|Laptop joined23:09
← weijin left23:09
← flobin left23:10
← paraxial left23:10
← mikedd left23:10
→ paraxial joined23:11
← v4ult left23:11
← Matze202 left23:12
→ pgupta joined23:12
→ watabou joined23:12
← zzz left23:13
← syntaxxx__err_0r left23:13
→ zzz joined23:13
→ syntaxxx__err_0r joined23:13
→ hahuang61 joined23:16
← rkd left23:17
→ nowhere_man joined23:17
← mikecmpbll left23:17
← phluks left23:17
← jimi_ left23:18
→ phluks joined23:18
→ rafasc joined23:19
← ZyX-I left23:19
← banisterfiend left23:19
← mattmccarty_ left23:20
→ weijin joined23:20
→ banisterfiend joined23:22
← greggerz left23:23
→ Matze202 joined23:23
← moei left23:23
← weijin left23:25
← zzz left23:25
→ zzz joined23:26
← phluks left23:26
← ryanjohnstonyyc left23:27
← banisterfiend left23:28
→ ryanjohnstonyyc joined23:28
→ VoradorPT joined23:29
→ phluks joined23:31
← Pacra left23:31
← coumbole left23:31
→ banisterfiend joined23:32
← mlopezviedma left23:32
→ mlopezviedma joined23:32
← bolovanos left23:33
→ spicerack joined23:34
← pgupta left23:35
← zzz left23:36
→ zzz joined23:36
← zzz left23:36
← spicerack left23:36
→ zzz joined23:36
→ wootehfoot joined23:37
← xfbs left23:37
← zzz left23:37
→ zzz joined23:38
← barduck left23:38
← Darcidride_ left23:38
← VoradorPT left23:39
← user2468 left23:39
← hahuang61 left23:40
← zzz left23:40
→ hahuang61 joined23:40
→ zzz joined23:40
→ VoradorPT joined23:40
← hahuang61 left23:40
→ hahuang61 joined23:41
→ minionofgozer joined23:43
→ weijin joined23:44
← nanga left23:44
→ xqb` joined23:45
← xqb left23:45
xqb` → xqb23:45
→ nanga joined23:46
← nanga left23:46
→ nanga joined23:46
← weijin left23:48
→ pgupta joined23:49
← cek left23:52
→ weijin joined23:53
← pgupta left23:53
← LiftLeft left23:53
← masuberu left23:54
→ LiftLeft joined23:54
← Raed|Laptop left23:54
← LiftLeft left23:54
← thiago left23:55
→ LiftLeft joined23:55
← phluks left23:56
→ phluks joined23:56
← LiftLeft left23:56
→ rkd joined23:56
← muelleme left23:57
← dsdeiz left23:58
← weijin left23:58

Logs Search ←Prev date Next date→ Channels Documentation