IRCloggy #git 2019-06-24

Logs Search ←Prev date Next date→ Channels Documentation

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

2019-06-24

igemnace joined00:01
nerosnm joined00:04
veegee left00:09
robertparkerx joined00:11
robertparkerx how do I pull a remote branch into local branch?00:11
igemnace git pull <remote> <remote branch name>:<local branch name>00:14
see git help pull00:14
if this is just a one-time thing, i actually prefer fetching then merging; it flows more clearly that way. git fetch then git merge <remote-tracking branch name>00:16
veegee joined00:16
igemnace if it isn't, consider setting the remote branch as an upstream00:16
mattfly left00:17
Tibian left00:18
mat001 left00:22
xorander joined00:23
veegee left00:25
veegee_ joined00:25
wjschmidt left00:26
m0viefreak left00:26
mowcat left00:27
n000g joined00:27
queip left00:27
mat001 joined00:30
mat001 left00:32
queip joined00:36
nerosnm left00:36
barteks2x left00:37
jcbitter joined00:37
robertparkerx It is a one thing thing I believe00:38
nerosnm joined00:48
Cabanossi left00:50
JanC left00:51
rishi joined00:51
JanC joined00:51
CryptoDavid left00:51
dongcarl left00:52
hoek left00:52
mns joined00:52
ZachGibbens joined00:52
rodarmor joined00:53
Wizek joined00:53
dongcarl joined00:53
yn joined00:53
hoek joined00:53
CryptoDavid joined00:53
jelmer joined00:53
Cabanossi joined00:54
veegee joined00:55
z8z left00:57
veegee_ left00:58
veremitz joined00:58
mattfly joined01:01
mat001 joined01:02
kh31d4r left01:03
OtakuSenpai joined01:04
mat001 left01:04
dfee joined01:04
kh31d4r joined01:04
kh31d4r left01:07
kh31d4r joined01:09
netj left01:13
netj joined01:14
R2robot left01:18
OtakuSenpai left01:19
R2robot joined01:20
nerosnm left01:21
paws_ left01:22
netj left01:24
kh31d4r left01:24
netj joined01:24
kh31d4r joined01:24
learningc joined01:25
AtumT left01:25
ferdna left01:31
mattfly whats the best git gui for linux?01:32
Newami joined01:32
ferdna joined01:32
learningc left01:32
learningc joined01:33
drbean joined01:35
Cabanossi left01:36
finn0 Does this channel have Matrix IRC bridge support?01:37
F0rTex left01:39
finn0 I'm trying to connect it using Matrix client and @appservice-irc:matrix.org kicked me out with this "Could not join #git on 'chat.freenode.net': err_needreggednick" error message.01:39
F0rTex joined01:40
nerosnm joined01:42
rewt err_needreggednick -- i'm guessing that's an error message saying you need a regged nick (and tell matrix the info for it)01:44
freeman42x left01:45
ElectroStatik joined01:46
dfee left01:46
Cabanossi joined01:47
durham joined01:47
durham left01:47
durham joined01:48
durham left01:48
durham joined01:48
durham left01:49
iam730 joined01:49
durham joined01:50
durham left01:51
durham joined01:51
durham left01:51
durham joined01:52
durham left01:52
durham joined01:53
cd left01:56
finn0 rewt: I found a FAQ covering that error message https://github.com/matrix-org/matrix-appservice-irc/wiki/End-user-FAQ#i-am-getting-kicked-out-of-a-bridged-room-with-the--err_needreggednick-error01:57
durham left01:58
esrse joined02:00
CryptoDavid left02:01
eb0t joined02:03
cd joined02:04
nerosnm left02:15
armyriad joined02:23
unrael__ joined02:24
lagothrixGuest9006802:24
Guest90068 left02:24
lagothrix joined02:24
unrael__unreal02:24
freeman42x joined02:27
Bodger_ left02:33
bambanx left02:35
nerosnm joined02:36
sorressean joined02:36
sorressean I added a bunch of files to gitignore, but they're still part of my repo because I added them. is there a way to git rm so they can remove them from the repo without actually deleting the files?02:37
Kaisyu7 joined02:37
Goplat joined02:49
thebope joined02:50
AK joined02:53
AK how to remove all git cached commits and push a newone such that size of repo dont increase02:53
Cabanossi left02:58
z8z joined02:58
alyptik left03:01
sauvin left03:03
g00s left03:04
fphilipe_ joined03:07
nerosnm left03:07
Cabanossi joined03:12
fphilipe_ left03:12
fatalhalt left03:19
fatalhalt joined03:22
ygivenx joined03:22
igemnace sorressean: git rm --cached03:23
AK: hmm, not sure i understand. what's the overarching goal here?03:23
cbreak left03:24
cbreak joined03:25
freeman42x left03:28
oatmealraisin left03:28
nerosnm joined03:30
g00s joined03:30
iam730 left03:33
thebope left03:38
bket left03:39
mven joined03:40
thebope joined03:41
bket joined03:41
fatalhalt left03:46
ephemera_ joined03:47
hallamigo left03:48
mven left03:52
mven joined03:53
mud joined03:53
durham joined03:54
thebope left03:58
durham left03:58
null1337 left03:58
ygivenx left04:01
nerosnm left04:01
Anthaas left04:03
Anthaas_ joined04:03
mrCyborg joined04:06
rudrab joined04:10
rudrab hi, what is the last line of git status called?04:11
I am trying to color git output, like https://paste.fedoraproject.org/paste/rJfohENof9xcmZW2BXw0tA04:11
but the last line, that says "nothing to commit, working tree clean" etc, is not colored04:12
must be the tag is missing04:12
ElectroStatik left04:15
ygivenx joined04:16
ygivenx left04:21
dviola joined04:21
nerosnm joined04:23
rudrab left04:24
alyptik joined04:27
dfee joined04:29
queip left04:29
Anthaas_ left04:30
Anthaas joined04:32
SkarmoutsosV joined04:34
atrigent joined04:34
queip joined04:36
cfoch left04:41
cd left04:46
g00s left04:52
orbyt_ left04:54
nerosnm left04:54
pks_ joined05:02
Inline left05:03
fflam joined05:04
pks left05:04
pks_pks05:04
fphilipe_ joined05:11
ferdna left05:13
nerosnm joined05:16
bashfulshell left05:20
SkarmoutsosV left05:24
breakingsad joined05:27
fphilipe_ left05:33
thiago left05:37
g00s joined05:39
nerosnm left05:48
fphilipe_ joined05:49
ygivenx joined05:50
clime joined05:50
fphilipe_ left05:54
omnireq_ joined05:54
omnireq left05:56
ygivenx_ joined05:58
finn0 left05:59
ZombieByte joined05:59
ghostlines left06:00
ghostlin_ joined06:00
ygivenx left06:02
phlym_ joined06:06
iamthad joined06:07
EnTeQuAk_ joined06:07
fcrick_ joined06:08
afisher_ joined06:08
nictuku_ joined06:08
d10n-work_ joined06:08
JayDoubleu_ joined06:08
SrPx_ joined06:08
CEnnis91_ joined06:08
drupol_ joined06:08
heinrich5991_ joined06:08
Karyon_ joined06:08
CheckYourSix_ joined06:09
federico3_ joined06:09
SoniEx2 joined06:09
Forkk joined06:09
TomTom joined06:10
nick` joined06:10
nerosnm joined06:10
beaky_ joined06:10
n3wborn joined06:11
unixdork joined06:14
Swant_ joined06:14
AK left06:15
xelxebar left06:15
mojisun left06:15
tombusby left06:15
ghost43 left06:15
galaxie left06:15
Fusl left06:15
cathyjf joined06:15
__name__ joined06:15
d10n-work left06:15
iamthad_ left06:15
heinrich5991 left06:15
Karyon_Karyon06:15
fcrick_fcrick06:15
nictuku_nictuku06:15
unixdorknixdork06:15
afisher_afisher06:15
drupol_drupol06:15
SrPx_SrPx06:15
CEnnis91_CEnnis9106:15
d10n-work_d10n-work06:15
heinrich5991_heinrich599106:15
cathyjfCathy06:15
JayDoubleu_JayDoubleu06:16
Swant_Swant06:16
haasn left06:16
ygivenx_ left06:17
haasn joined06:17
ygivenx joined06:18
vavkamil left06:20
mattfly left06:20
Envil joined06:20
Iroha joined06:20
_rgn joined06:22
pandem joined06:22
Timvde joined06:22
MACscr left06:23
Noti joined06:23
cyberlard joined06:25
kadoban joined06:25
sauvin joined06:28
unreal left06:29
ygivenx left06:30
ygivenx joined06:31
duderonomy left06:31
duderonomy joined06:32
duderonomy left06:32
duderonomy joined06:33
duderonomy left06:33
duderonomy joined06:33
duderonomy left06:34
n3wborn left06:37
dege joined06:38
ygivenx left06:40
nerosnm left06:42
ygivenx joined06:42
Mattiaslndstrm joined06:42
atrigent left06:45
rohit[m] joined06:45
ygivenx left06:47
chele joined06:49
gloomy joined06:49
salad joined06:50
omnireq_ left06:53
Bobguy left06:53
mayurvpatil joined06:55
mayurvpatil left06:55
OtakuSenpai joined06:55
tufteddeer joined06:56
duderonomy joined06:56
mayurvpatil joined06:56
mayurvpatil left06:56
atrigent joined06:56
stdedos joined07:00
stdedos Hello there! I have `Master---/Branch1--commit1--commit2 / Branch2--commit3` this setup. I use git pull / rebase to make my `branch1` up-to-date. I then want to move branch2 to its original location (`commit3` replayed on top of the new `branch1`). `git rebase branch1` seems to replay all 3 commits though.07:00
Is this a mistake, or I am writing the command wrong?07:00
ygivenx joined07:01
TomyWork joined07:03
ygivenx left07:07
ygivenx joined07:08
fphilipe_ joined07:09
Newami left07:11
atrigent left07:13
elroncio joined07:16
duderonomy left07:17
ygivenx left07:21
nerosnm joined07:23
aw1 joined07:23
BeerLover joined07:26
agowa338 joined07:28
Jackneill joined07:34
jstein joined07:34
hussam left07:36
j416 stdedos: !lol07:37
gitinfo stdedos: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all07:37
j416 could you show this?07:37
stdedos Isn't it going to be long for here? :/07:37
j416 or something similar so that we can see the graph07:37
skip the commit messages and such if you prefer07:37
I don't quite understand your branches07:37
commit hashes (obfuscate if you want) and graph07:38
Jackneill left07:39
Jackneill joined07:40
Jackneill left07:41
Jackneill joined07:42
jast for long output: !paste07:42
gitinfo Please use a pastebin for snippets longer than one line. Persistent and can be used with a GitHub account: https://gist.github.com/ - one hour auto-delete: https://upaste.de/07:42
stdedos jast https://upaste.de/T4907:43
jast hmm, there's a duplicate commit ID in that list (lines 6 & 7)07:47
dartmouthed joined07:48
stdedos actually, that's the one I mocked :-p07:48
jast purely based on that graph, I can say that a rebase of branch-2 onto branch-1 would replay the commits in lines 3 & 407:49
stdedos they are different (4 instead of a 5)07:49
jast oh, my bad :)07:49
stdedos I would guess so. But, I said that I am using `git pull --rebase` to pull07:50
So, I guess that `8eee44776d8` will change commit "when needed07:50
"07:50
So, that will end-up playing `8eee44776d8` on top of everything else, on top of the "new version" of `8eee44776d8`07:51
mikecmpbll joined07:51
edwardly left07:51
gde33 left07:52
gde33 joined07:52
ygivenx joined07:53
nerosnm left07:55
durham joined07:56
ygivenx left07:58
g00s left08:00
mayurvpatil joined08:00
durham left08:00
dfee left08:01
mayurvpatil left08:03
ygivenx joined08:03
TomyWork left08:06
TomyWork joined08:07
ygivenx left08:10
dfee joined08:10
edwardly joined08:10
KnoP joined08:11
joe2 joined08:12
queip left08:16
lss8 joined08:16
ygivenx joined08:17
nerosnm joined08:19
mimajof joined08:20
queip joined08:21
finn0 joined08:27
ygivenx left08:32
mayurvpatil joined08:32
floppydh joined08:33
mayurvpatil left08:33
BeerLover left08:33
floppydh `git cherry` apparently shows merged&squashed commits, is there a way to circumvent this?08:33
ygivenx joined08:37
floppydh can I do something on a commit-basis to have them not show up in `git cherry` because I know they have been merged&squashed?08:38
BeerLover joined08:39
Shentino left08:43
ygivenx left08:46
Shentino joined08:46
nerosnm left08:49
igemnace left08:49
igemnace joined08:50
z8z left08:53
alkisg joined08:54
mage_ any idea how could I git format-match only for file within a certain directory ?08:56
format-patch*08:56
alkisg Hi, I'm trying `git apply my.patch`, with patch=https://termbin.com/w7vl, but it tells me: error: wifi.h: No such file or directory08:56
I think I need to tell it to ignore the a/ directory and search ./include when the patch says "a/include/wifi.h"; how can I do that?08:56
tribly joined08:57
MACscr joined08:58
Tobbi_ joined09:01
hofmann3900 left09:04
ygivenx joined09:04
alkisg git apply -p0 did it; thanks09:06
ygivenx left09:10
joe3 joined09:10
joe2 left09:13
ygivenx joined09:15
mage_ any idea for this https://gist.github.com/silenius/b7bfe4a7073d8aa9858d44760e9a3b53 ?09:15
I'd to do a 3way merge but I got nothing ..09:16
I don't have any <<< and >>> in the file09:18
ygivenx left09:20
ygivenx joined09:21
queip left09:22
aw1_ joined09:23
aw1_ left09:23
is_null joined09:23
alkisg left09:24
oxymoron93 joined09:25
aw1 left09:25
finn0 left09:27
ygivenx left09:27
queip joined09:28
ygivenx joined09:29
floppydh left09:33
ygivenx left09:34
tufteddeer left09:36
tufteddeer joined09:36
zamba left09:37
mikecmpbll left09:39
zamba joined09:40
mikecmpbll joined09:40
zonixo joined09:47
Goplat left09:49
zamba left09:50
yuljk left09:51
mayurvpatil joined09:52
mayurvpatil left09:52
mayurvpatil joined09:52
mayurvpatil left09:53
mayurvpatil joined09:53
mayurvpatil left09:53
clime left09:53
yuljk joined09:54
mayurvpatil joined09:54
mayurvpatil left09:54
zamba joined09:54
mayurvpatil joined09:55
floppydh joined09:55
mayurvpatil left09:55
mayurvpatil joined09:55
mayurvpatil left09:56
perrier-jouet joined10:02
lankanmon left10:02
bsanford joined10:04
bsanford left10:04
Tobbi_ left10:06
Tobbi_ joined10:06
TomyWork left10:07
mimajof left10:09
Fusl joined10:09
TomyWork joined10:11
ygivenx joined10:13
ghostlin_ left10:13
BeerLover left10:16
BeerLover joined10:18
mimajof joined10:18
dfee left10:19
zamba left10:19
dfee joined10:19
Sonderblade joined10:20
yonder left10:21
igemnace left10:21
zamba joined10:22
tens0r joined10:22
ygivenx left10:23
julius_ joined10:24
julius_ hi10:24
tens0r left10:25
julius_ first timer with branching, im following this howto: https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches after the step: git remote add [name_of_your_remote] [name_of_your_new_branch] it tells me to run: git push [name_of_your_new_remote] [url] and im not really certain why i shou10:25
ld provide url? i mean the url isnt changing for the branch, its just a new name....isnt it?10:25
dfee left10:29
jast julius_: the information there is wrong. you'd pass the name of the remote and the name of the branch, actually.10:29
not sure why the guide says something about multiple repositories/remote, anyway10:31
the info about how to create a new remote is wrong, too, btw10:31
the two are mixed up: 'git remote add' needs the URL and 'push' needs the name of the branch10:31
but if you have only one repository, all you need is the remote you already had10:32
thefatma joined10:33
zonixo left10:33
clime joined10:35
ygivenx joined10:37
dfee joined10:38
luckman212 joined10:38
AfroThundr|main left10:39
rapha left10:40
mingdao joined10:41
BeerLover left10:42
ygivenx left10:43
Rh0nda joined10:43
julius_ ok great10:44
VectorX joined10:44
AfroThundr|main joined10:45
dmc left10:45
dfee left10:48
ygivenx joined10:50
BeerLover joined10:50
nav2002 joined10:51
alvan joined10:52
federico3_federico310:54
ygivenx left10:55
BeerLover left10:55
alvan hi .. is is possible to create a new remote tag from remote master without having a local clone using git cli commands ? (i know there is API and some python scripts but i like not to install and use other tools except git cli )10:58
ygivenx joined10:59
unreal joined10:59
dmc joined11:00
tmz joined11:00
rapha joined11:01
nav2002 left11:02
emsjessec joined11:03
ygivenx left11:04
z8z joined11:05
esrse left11:06
tombusby joined11:06
ghost43 joined11:06
rapha left11:07
alvan left11:09
AK joined11:09
alvan joined11:09
GyrosGeier alvan, you can do a shallow clone11:10
but there is no "pretend that we're in a repo" mode11:10
galaxie joined11:11
j7k6 joined11:15
mojisun joined11:15
BeerLover joined11:20
elroncio left11:20
lankanmon joined11:24
ygivenx joined11:25
emsjessec left11:25
Lucas_Gray joined11:29
ygivenx left11:30
clime left11:31
ghostlines joined11:32
rapha joined11:34
mowcat joined11:36
tomboy64 joined11:36
beaky_beaky11:36
FlatPanda joined11:39
ygivenx joined11:40
oatmealraisin joined11:41
ygivenx left11:45
dviola left11:45
tufteddeer left11:45
learningc left11:46
zonixo joined11:46
Isla_de_Muerte left11:53
Isla_de_Muerte joined11:53
durham joined11:57
ke4roh joined11:57
zonixo left11:59
emsjessec joined12:00
victorqueiroz left12:01
savolla joined12:01
elroncio joined12:01
durham left12:02
cdown joined12:06
pengwens left12:06
bashfulshell joined12:09
Behold joined12:09
thefatma left12:09
ygivenx joined12:09
alvan GyrosGeier i was thinking maybe instead of shallow to use git clone --bare ?12:14
GyrosGeier you can combine them12:15
a bare repo is sufficient for creating a tag12:15
I'm not sure if knowing the full commit ID is sufficient for creating a tag or if you need a copy of the commit object12:16
but if you do a shallow bare clone with just that one commit, that is enough for creating the tag12:16
CodeSlingerPaul joined12:17
BeerLover left12:17
ygivenx left12:20
mud left12:22
hofmann3900 joined12:27
z8z left12:28
gxt joined12:29
lucasb joined12:30
alvan GyrosGeier it works with git clone --bare or git clone --no-checkout as well, but you need to remove the bare .git repo data if already exists on local12:31
mowcat left12:32
GyrosGeier yes12:33
donofrio joined12:33
GyrosGeier I'd combine them so you don't need to copy all the objects, but only those for the commit you want to tag12:33
alvan yeah agree, thank you12:34
BeerLover joined12:38
BeerLover left12:38
zonixo joined12:40
mowcat joined12:44
fission6 joined12:44
Stummi do git commits actually store timestamps with zone or is it just displaying?12:46
nvm, I just realized I can checkout some third repo and look at it. Seems timezone (or offset) actually is stored in the commit12:48
GyrosGeier Git internal format It is <unix timestamp> <time zone offset>, where <unix timestamp> is the number of seconds since the UNIX epoch. <time zone offset> is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is +0100.12:48
according to git-commit(1)12:48
ygivenx joined12:49
stdedos left12:50
zonixo left12:53
galaxie left12:56
galaxie joined12:58
fission6 left12:59
ygivenx left13:00
gloomy left13:02
gloomy joined13:03
xelxebar joined13:04
gloomy left13:05
neunon joined13:06
howell joined13:07
ygivenx joined13:09
xcm left13:10
xcm joined13:11
neunon left13:11
neunon joined13:11
ygivenx left13:15
savolla left13:15
tufteddeer joined13:16
nuala joined13:17
gloomy joined13:18
ygivenx joined13:18
ygivenx left13:24
joe3revoltingPeasant13:26
zonixo joined13:27
ghostlines left13:28
ghostlines joined13:30
ygivenx joined13:30
ghostlines left13:30
ghostlines joined13:31
ghostlines left13:32
elichai2 joined13:32
ghostlines joined13:32
ghostlines left13:32
ghostlines joined13:33
ghostlines left13:33
ghostlines joined13:33
ghostlines left13:34
ygivenx left13:35
oatmealraisin left13:35
ghostlines joined13:35
ghostlines left13:35
Sonderblade left13:36
Atlenohen joined13:36
lacrymology joined13:41
cdown left13:42
ke4roh left13:42
Inline joined13:43
nowhereman joined13:45
magic_ninja left13:45
mat001 joined13:46
ygivenx joined13:47
duderonomy joined13:48
rsrx joined13:50
cdown joined13:50
czart joined13:50
clime joined13:51
victorqueiroz joined13:53
shabius joined13:53
hussam joined13:54
igemnace joined13:56
altendky joined13:57
mayurvpatil joined13:57
ygivenx left13:57
thefatma joined13:59
emsjessec left13:59
magic_ninja joined13:59
nowhereman left14:00
ygivenx joined14:00
is_null left14:00
cdown left14:02
Sonderblade joined14:04
cdown joined14:04
emsjessec joined14:06
nowhereman joined14:06
OtakuSenpai left14:07
cdown left14:10
nowhereman left14:11
ygivenx left14:13
greggerz joined14:14
queip left14:16
jcbitter left14:19
boombatower joined14:20
jcbitter joined14:20
p3rL joined14:21
p3rL how to remove specific commit14:22
queip joined14:22
BtbN define remove14:22
haymawk you could do an interactive rebase and delete specific commits14:22
BtbN You could revert it, to undo its changes. Actively purging it from the history will cause some issues and require a force push, and annoy everyone else using that repo.14:23
p3rL i want to remove 2nd commit only but want the uppers git checkout HEAD~214:23
robertparkerx Is there a way to remove ALL untracked files?14:23
BtbN git clean with the right flags14:24
it's potentially quite destructive, so be very sure before running it14:24
robertparkerx git clean -n14:24
git clean -f14:24
?14:24
p3rL left14:29
emsjessec left14:30
clime left14:31
julius_ left14:33
haymawk git clean -xdf will remove anything that's in your .gitignore file including directories14:33
jelmer left14:36
m1dnight_ joined14:37
m1dnight1 left14:40
T_UNIX joined14:40
m1dnight1 joined14:40
learningc joined14:40
magic_ninja left14:40
jelmer joined14:42
duderonomy left14:43
m1dnight_ left14:44
m1dnight_ joined14:47
jelmer left14:49
durham joined14:49
durham left14:50
m1dnight1 left14:50
def_jam joined14:54
eb0t_ joined14:54
YuGiOhJCJ joined14:55
AbleBacon joined14:55
eb0t left14:55
mowcat left14:55
jelmer joined14:56
magic_ninja joined14:56
Noti left14:57
tufteddeer left14:58
tufteddeer joined14:58
queip left14:58
jelmer left14:58
SerialSmile joined14:59
fission6 joined15:01
gloomy left15:02
elroncio left15:03
mat001 left15:03
jelmer joined15:04
agowa338 left15:04
subopt joined15:06
zonixo left15:06
thiago joined15:09
gloomy joined15:09
alvan left15:10
ygivenx joined15:10
CheckYourSix_CheckYourSix15:10
ygivenx left15:15
ygivenx joined15:15
chele left15:18
Sleepy63 left15:19
dmc left15:19
TomyWork left15:20
oxymoron93 left15:22
JeffH joined15:27
rsrx left15:28
dmc joined15:29
bashfulshell left15:31
JeffH left15:34
durham joined15:36
thefatma left15:41
thefatma joined15:42
revoltingPeasant left15:45
revoltingPeasant joined15:46
mayurvpatil left15:46
cdown joined15:47
durham left15:48
FlatPanda left15:51
mayurvpatil joined15:52
mayurvpatil left15:52
emsjessec joined15:52
rohit[m] left15:54
cdown_ joined15:55
mat001 joined15:57
dmj8and3 joined15:57
mat001 left15:57
dmj8and3 RIP old webchat15:57
cdown left15:57
mat001 joined15:57
cdown_cdown15:58
dmj8and3 Hey all, I searched for this and nothing really came up, so I'm hoping for a quick sanity check.15:58
git rebase --onto HEAD~2 HEAD~115:59
This will remove the changes+commit from the 2nd-to-last commit on the current branch, right?16:00
agowa338 joined16:01
learningc left16:04
osse yes16:04
im0nde joined16:04
Lucas_Gray left16:05
dmj8and3 thanks!16:05
im0nde_ joined16:06
im0nde- left16:06
mowcat joined16:06
im0nde| left16:06
xcm left16:07
xcm joined16:07
GyrosGeier dmj8and3, protip: unless you are writing a script, use "git rebase -i"16:09
mimajof left16:09
fphilipe_ left16:09
dmj8and3 i'd prefer to understand both ways, and this form seems like the place to start16:09
thiago left16:10
dmj8and3 the interactive one feels a bit weird, yeah?16:10
GyrosGeier I use it to clean up commits before submitting them16:11
thefatma left16:12
GyrosGeier e.g. if I insert a debug printf somewhere, I immediately commit that with -mDISCARD16:12
then when I'm done I can just drop all the lines containing DISCARD in the interactive editor, and rebase the debug code out16:12
dmj8and3 neat. Reading the man page now, which helps16:16
floppydh left16:16
dmj8and3 i had some bad experiences in the past with the whole "open editor, make changes" thing. I don't even remember when or what.16:16
Sleepy63 joined16:16
dmj8and3 but I haven't seen this fail yet, so I'll roll with it16:17
duderonomy joined16:18
YuGiOhJCJ left16:19
durham joined16:21
rkta left16:23
rkta joined16:23
mns I have cloned a remote repo, created a branch local-branch, switched to local-branch, created a tag and then pushing the tag back to origin/master. In the meantime origin/master has had several commits made to it. How do I push just the tags from local-branch without getting the push rejected because remote contains work that I don't have locally.16:26
duderonomy left16:26
cdown left16:28
orbyt_ joined16:28
iam730 joined16:32
durham left16:34
alyptik left16:34
nuc joined16:35
fphilipe_ joined16:35
theoceaniscool joined16:36
haymawk git push origin <tag_name>16:41
thiago joined16:47
irrgit left16:48
vavkamil joined16:49
revoltingPeasant left16:51
Atlenohen left16:51
mikecmpbll left16:51
fstd_ joined16:53
nuala left16:55
eb0t_eblip16:56
fstd left16:57
fstd_fstd16:57
nuala joined16:58
mrpropa joined16:59
mns haymawk: thanks, that worked. whats the difference between that and using "git push --tags origin local-branch:master" ?17:00
troulouliou_dev joined17:00
irrgit joined17:01
goiko joined17:02
Zarthus (18:12:08) <GyrosGeier> e.g. if I insert a debug printf somewhere, I immediately commit that with -mDISCARD17:02
how many DISCARD commits do you usually wipe after a rebase :P17:02
kh31d4r left17:02
mat001_ joined17:03
fission6 left17:03
kh31d4r joined17:03
mat001_ left17:03
mat001_ joined17:04
wildlander left17:05
mat001 left17:06
GyrosGeier ten or so17:07
depends on the problem17:07
making individual commits means I can mix changes in the history, and then reorganize them later17:09
e.g. if I have a build system change that prepares something but doesn't break anything else, I make a separate commit, make a note in the message that this needs to go early into the submission, and then I can ignore the change until reorg time17:10
step one is to sort thematically, do a bit of squashing17:10
then run "git rebase -x make" to make sure each commit also builds17:11
then refine from there17:11
wildlander joined17:11
fission6 joined17:12
Atlenohen joined17:12
dfee joined17:15
mattfly joined17:16
nowhereman joined17:16
yonder joined17:17
Atlenohen left17:18
JeffH joined17:22
jhulten joined17:26
mikecmpbll joined17:27
alonkli joined17:27
alonkli12 joined17:27
alyptik joined17:28
thefatma joined17:28
mat001 joined17:28
qpdb once in a while i rebase -i the same branch on different hosts without any syncing. when i run into "missing" code i wonder if i actually implemented it or just dreamed about doing it - then i take a trip to reflog hell17:29
skywalker joined17:29
cbreak GyrosGeier: try -m'fixup!'17:29
JeffH left17:29
cbreak GyrosGeier: and then git rebase --autosquash17:29
GyrosGeier: you can get the proper fixup pattern with git commit --fixup or --squash17:30
nuala left17:31
tufteddeer left17:31
tufteddeer joined17:32
mat001_ left17:32
skywalker very often i want to rebase my branch to squash some commits. i usually git rebase -i HEAD~n. how can i tell git i want to rebase all my commits from HEAD to the first commit of my branch?17:32
GyrosGeier cbreak, I do that sometimes, but most of the time I just number the features in my head17:32
so -mf2 -mf3 and so on17:33
cbreak skywalker: man git-merge-base17:33
gitinfo skywalker: the git-merge-base manpage is available at https://gitirc.eu/git-merge-base.html17:33
GyrosGeier the fixup! syntax expects you to know the existing commit message17:33
cbreak merge-base functionality is built-in in the rebase syntax17:33
skywalker thanks17:34
GyrosGeier it'd be cool if there was an --autodiscard to drop all 'discard!' commits17:34
cbreak but it's mingled with the destination of the merge base too17:34
GyrosGeier: you don't have to commit those17:34
GyrosGeier it's a lot easier if I commit them, because then I don't have to ignore them time and time again with git-add17:35
cbreak you don't have to17:35
you can do git checkout -p to remove them17:35
GyrosGeier assuming that the debug printfs are not anywhere near the code I've changed17:35
checkout -p is really annoying if you have to edit the patch17:36
tufteddeer left17:36
GyrosGeier especially for the "added a printf" case, where I have to replace all '-' lines by ' ', and drop all '+' lines except those I want to delete17:36
tufteddeer joined17:36
oatmealraisin joined17:38
skywalker so, something like git rebase -i $(git merge-base master feature), right?17:40
freeman42x joined17:41
is_null joined17:42
AtumT joined17:45
skywalker or even better instead of feature, just HEAD (in my specific case)17:45
tufteddeer left17:45
cliluw joined17:45
GyrosGeier if you don't give a ref, it uses the "upstream" branch for the branch you're on17:46
tufteddeer joined17:46
GyrosGeier I often do "git checkout -b feature1 origin"17:46
and "git rebase" on that branch implies rebasing on top of origin/HEAD17:46
skywalker cool17:48
tufteddeer left17:50
is_null left17:52
def_jameb0t17:53
kh31d4r left17:53
kh31d4r joined17:53
sbeyer joined18:00
xcm left18:02
xcm joined18:02
jubal joined18:02
dfee left18:03
pks_ joined18:04
fission6 left18:05
pks left18:06
pks_pks18:06
iam730 left18:08
Sasazuka joined18:08
iam730 joined18:10
leeN joined18:10
is_null joined18:12
dino82 joined18:13
seebyr joined18:17
T_UNIX left18:19
dfee joined18:20
sbeyer left18:20
Newami joined18:20
seebyrsbeyer18:20
bongjovi joined18:21
is_null left18:22
joe4 joined18:26
Eryn_1983_FL joined18:28
sauvin left18:33
nowhere_man joined18:36
nowhereman left18:36
fission6 joined18:36
galaxie left18:38
nowhere_man left18:42
ZombieByte left18:42
mat001 left18:46
mat001 joined18:47
is_null joined18:51
kneeki left18:51
kneeki joined18:51
kneeki left18:52
SoniEx2Soni18:55
leeN left18:56
Sonderblade left18:57
wrkrcoop joined18:57
wrkrcoop hey i messed up my local branch pretty bad. is it possible to delete my local branch and pull the branch i have a PR for? the PR has not been merged yet18:57
bongjovi left18:58
vishal wrkrcoop: !rtb18:58
gitinfo wrkrcoop: [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branc18:58
kh31d4r left18:58
is_null left18:58
Atlenohen joined18:58
z|bandito joined19:00
vishal wrkrcoop: unless, did you mean you also pushed to your fork - from which the PR was originally created - and want to use upstream/PR to restore your local repo as well as your fork on whatever hosting site?19:01
agowa338 left19:01
duderonomy joined19:03
duderonomy left19:04
mattfly left19:05
nuala joined19:06
iam730 left19:08
zonixo joined19:10
bongjovi joined19:11
CodeSlingerPaul left19:16
pengwens joined19:16
wrkrcoop left19:17
reveer joined19:18
cbreak left19:21
cbreak joined19:21
pengwens left19:22
wolfshappen joined19:25
Mattiaslndstrm left19:26
m0viefreak joined19:26
perrier-jouet left19:27
im0nde- joined19:27
im0nde_ left19:28
im0nde_ joined19:28
im0nde left19:28
jarlopez joined19:28
jarlopez I'm on a local dev branch where a commit 3 commits ago included some changes that now should be undone. What's a good way to handle this? `git rebase -i HEAD~3` and `edit` the commit?19:30
gloomy left19:30
tufteddeer joined19:30
vishal jarlopez: if !rewrite is ok, then yes19:30
gitinfo jarlopez: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum19:30
vishal you might also need HEAD~4 instead of HEAD~319:31
jarlopez Yes, in this case I'm the sole owner of the branch with comments living on GitHub19:31
vishal should be ok then19:31
jarlopez Thanks, y'all19:32
vishal One option is to make a new commit with the changes, and then rebase -i to move it right after the orig commit, and mark it as fixup19:32
bongjovi left19:32
vishal I use that sort of a workflow all the time19:32
commit even has a --fixup=<sha> option to make that easier19:32
Cabanossi left19:33
jarlopez I thought about that as well, but the original commit contains many snippets that I'd like to `git checkout --ours` on19:33
vishal though I think you need to set some config option to make rebase reposition and mark fixup/squash commits automagically19:33
jarlopez I'd like to "undo" the changes from the commit, re-stage the revelant ones, and use those changes as the original commit19:34
vishal ok, 'edit' can be an option of there are many conflict opportunities, but you will hit those conflicts after the edit stage anyway when rebase moves on to the next commits19:34
Cabanossi joined19:34
vishal yep edit should be able to handle that19:34
edit, followed by reset --mixed HEAD~1, and then stage the stuff you want19:34
nedbat "git remote prune origin" shouldn't delete anything on the remote repo, should it?19:35
jarlopez vishal: Aha, that's the missing piece I think19:35
emsjessec left19:35
vishal nedbat: no, only cleanup RTBs that are no longer present on the remote19:35
jarlopez vishal: What does --mixed do in this case?19:35
salad left19:36
vishal --mixed is the default, it doesn't touch the working tree but undoes the commit and also unstages19:36
jarlopez Beautiful. Thanks, vishal19:36
pengwens joined19:37
vishal cheers19:37
nowhere_man joined19:38
joe2 joined19:38
czart left19:38
fission6 left19:40
joe4 left19:41
dfee left19:41
troulouliou_dev left19:41
vishal nedbat: I find git remote prune kind of an awkward spot for that operation. I much prefer git fetch --prune19:41
nedbat vishal: the man page was helpful to say that it was the same as "git fetch --prune", which helped me understand it was local-only19:42
vishal I treat git-remote as a local only command (barring the --fetch option)19:42
yep19:42
perrier-jouet joined19:44
duderonomy joined19:44
parsnip joined19:46
duderonomy left19:47
is_null joined19:47
plexigras joined19:48
troulouliou_dev joined19:51
theoceaniscool left19:53
gde33 left19:55
fission6 joined19:56
JeffH joined19:56
gde33 joined19:57
reveer left19:58
mat001_ joined20:02
is_null left20:02
reveer joined20:02
mat001 left20:04
duderonomy joined20:04
subopt_subopt_in_repos20:06
_subopt_in_repos left20:06
duderonomy left20:06
Virox left20:10
Es0teric joined20:11
Es0teric hi, i have a quick question -- how do I merge two git repositories?20:12
fission6 left20:12
_ikke_ Es0teric: Do these repositories have something in common?20:12
Es0teric yeah.. one would be dev1 the other would be dev220:12
_ikke_ and 2nd question: what do you imagine the end result to be?20:12
Es0teric _ikke_ both repositories were already merged before at some point in time20:12
so i imagine their histories would be the same up to a certain point20:12
my end result would be... code from repo B to be merged into repo A20:13
_ikke_ Just add one repo as a remote to the other20:13
Zarthus what about the commits?20:13
Es0teric Zarthus i want all of the commits20:13
_ikke_ then fetch and merge the relevant branch20:13
Es0teric wait what?20:13
_ikke_ Es0teric: Do you know how to add remotes?20:14
Es0teric so you're saying I should have two origins in the remote then merge the dev branch from repo A to repo B?20:14
_ikke_20:15
vishal hands Es0teric some !books20:15
vishal er20:15
!book20:15
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable20:15
_ikke_ Es0teric: s/origins/remotes/20:15
n3wborn joined20:15
_ikke_ Es0teric: but yes, that's the idea20:15
Es0teric ok run that by me again20:16
would I have to pull down both repositories?20:16
_ikke_ You probably have at least on of them already cloned?20:16
Es0teric I do20:16
unreal left20:16
Es0teric but I am going to make a new folder that has the repo i want to merge to20:17
JeffH left20:17
tufteddeer left20:18
Es0teric _ikke_20:18
_ikke_ sure, go ahead20:18
tufteddeer joined20:19
Es0teric alright well its cloning now20:19
troulouliou_dev left20:20
ggSo joined20:20
zonixo left20:21
tufteddeer left20:23
fission6 joined20:24
Es0teric _ikke_ ok so I have both remotes on the branches20:24
i mean on the repo20:24
so on the origin branch that I am currently in do I do something like.. `git merge <remote>/<branch>20:26
` ?20:26
_ikke_ Es0teric: yes20:26
vishal yep, though I prefer to make a new branch for the merge attempt if I expect things to get ugly20:26
_ikke_ vishal: they already made a new clone20:27
vishal ah true20:27
Es0teric ╰─➤ git merge dev1 devel merge: dev1 - not something we can merge20:27
vishal is dev1 your remote?20:27
Es0teric vishal yeah20:28
tufteddeer joined20:28
tufteddeer left20:28
vishal git merge dev1/devel20:28
_ikke_ indeed20:28
tufteddeer joined20:28
Es0teric ╰─➤ git merge dev1/devel merge: dev1/devel - not something we can merge20:28
vishal20:28
_ikke_ Es0teric: what does git branch -r return?20:28
vishal git remote -v and git branch -av please20:28
SkarmoutsosV joined20:30
Onionnion joined20:31
pengwens left20:31
troulouliou_dev joined20:33
Es0teric _ikke_ https://kopy.io/i34Kl20:34
oh i mean vishal20:35
_ikke_ Es0teric: run git fetch dev120:35
Es0teric done20:36
_ikke_20:36
alyptik left20:36
_ikke_ Es0teric: Did you see it getting those branches now>20:36
?20:36
Es0teric yeah20:36
_ikke_ now you can do that merge20:36
Es0teric ahhh20:37
i see20:37
thanks!20:37
how do i know that i am in the origin branch and not dev1?20:38
vishal struggles with that paste output.. what happened to the commands? and what's this "into devel" and "folder" stuff :)20:38
_ikke_ Es0teric: origin is not a branch20:38
vishal: that's wrapped output from the previous line20:38
Es0teric vishal you asked me to show you what the output of your command was20:38
vishal _ikke_: oof I see20:38
Es0teric _ikke_ ok so how do I know that I am about to push to origin?20:39
vishal Es0teric: its the right output, the formatting is just very confusing20:39
Es0teric ok20:39
Raging_Hog joined20:39
fatalhalt joined20:39
_ikke_ Es0teric: one way would be to explicit about where you push to20:39
Fernando-Basso joined20:39
Es0teric so `git push origin devel`20:40
SerialSmile left20:40
_ikke_ Es0teric: yes20:40
Es0teric ok20:40
tufteddeer left20:42
pengwens joined20:44
tufteddeer joined20:44
Cabanossi left20:51
nowhere_man left20:54
jarlopez left20:57
kalib joined20:57
nowhere_man joined20:59
dfee joined20:59
kalib Hi guys. If I missed a commit when I merged my code from my local development branch to my local staging branch, and pushed that to my origin staging, I can fix that locally by using reset --hard on my local staging so I can properly merge again from my local development to my local staging with all the commits. I did it and the logs now seem ok, w20:59
ith all the commits local on my staging. If I push it now to my origin staging, would that be fixed there as well? Or do I need to also reset hard my remote staging before pushing?20:59
alyptik joined21:00
deltab kalib: I believe that'll be okay, but it'll need to be a force push, because you'll be pushing a head that doesn't have the current head as an ancestor (if I've understood you correctly)21:04
nowhere_man left21:05
nowhere_man joined21:06
Cabanossi joined21:06
craftyguy joined21:06
deltab it might cause trouble for someone else if they've pulled the earlier version and they add their own commits on top of that21:07
UrsoBranco joined21:07
TomTom left21:09
pengwens left21:10
AbleBacon left21:12
Es0teric left21:14
nowhere_man left21:16
tufteddeer left21:20
kalib deltab thanks21:20
tufteddeer joined21:20
dviola joined21:23
kerframil joined21:23
hellz joined21:24
pengwens joined21:24
fission6 left21:24
rkta left21:25
rkta joined21:25
kalib left21:26
reveer left21:28
kerframil left21:29
limarfrek joined21:29
tufteddeer left21:29
howell left21:29
limarfrekkerframil21:30
tufteddeer joined21:30
plexigras left21:32
dartmouthed left21:37
subopt joined21:38
jstein left21:38
tufteddeer left21:38
tufteddeer joined21:38
greatgatsby joined21:43
mattfly joined21:46
mattfly left21:46
fission6 joined21:47
greatgatsby left21:48
dmj8and3 left21:49
is_null joined21:52
duderonomy joined21:53
unomystEz joined21:56
duderonomy left21:56
Es0teric joined22:00
greggerz left22:01
Es0teric left22:01
duderonomy joined22:01
duderonomy left22:03
fission6 left22:04
unomystEz do git subtrees get tracked remotely? I.e, if someone clones a repo do any subtrees get automatically checked out?22:04
vishal unomystEz: do you mean submodules?22:04
DusteD left22:05
unomystEz vishal: I mean subtrees as I would prefer to stay away from submodules if possible22:05
vishal unomystEz: yes, the subtree simply becomes part of the repo22:06
unomystEz ok that's great22:06
SkarmoutsosV left22:07
orbyt_ left22:07
xelxebar left22:07
toothe left22:07
xelxebar joined22:07
mat001_ left22:08
mat001 joined22:08
rigid left22:11
duderonomy joined22:12
rigid joined22:13
cd joined22:17
duderonomy left22:18
tufteddeer left22:19
dege left22:20
a3Dman joined22:22
Es0teric joined22:24
Es0teric left22:26
nowhere_man joined22:26
JeffH joined22:31
JeffH left22:34
unomystEz left22:35
joe2 left22:38
joe2 joined22:39
orbyt_ joined22:42
duderonomy joined22:44
nic-hartley joined22:44
joe4 joined22:45
joe2 left22:46
duderonomy left22:46
thiago left22:55
thiago joined22:59
dfee left23:02
duderonomy joined23:02
n3wborn left23:03
greatgatsby joined23:05
duderonomy left23:06
Atlenohen left23:07
duderonomy joined23:07
fission6 joined23:08
seebyr joined23:08
joe__ joined23:08
boombatower left23:09
joe4 left23:10
pengwens left23:10
sbeyer left23:11
dviola left23:13
nowhereman joined23:13
nowhere_man left23:14
duderonomy left23:15
duderonomy joined23:16
ferdna joined23:17
duderonomy left23:18
bashfulshell joined23:18
duderonomy joined23:19
nowhereman left23:20
yyy- joined23:20
xcm left23:20
xcm joined23:21
duderonomy left23:22
is_null left23:25
duderonomy joined23:26
greatgatsby left23:26
kerframil left23:29
yyy- left23:30
duderonomy left23:31
Bobguy joined23:33
jhulten left23:33
oatmealraisin left23:33
duderonomy joined23:34
m0viefreak left23:35
duderonomy left23:36
kerframil joined23:37
seebyr left23:38
kerframil left23:40
kerframil joined23:40
duderonomy joined23:41
troulouliou_dev left23:41
kerframil left23:42
kerframil joined23:42
sweatsuit joined23:43
troulouliou_dev joined23:43
duderonomy left23:43
Cabanossi left23:43
duderonomy joined23:45
duderonomy left23:49
duderonomy joined23:50
Atlenohen joined23:51
hofmann3900 left23:51
hofmann3900 joined23:52
duderonomy left23:52
Cabanossi joined23:53
hofmann3900 left23:53
igemnace left23:56
duderonomy joined23:56
mat001 left23:56

Logs Search ←Prev date Next date→ Channels Documentation