IRCloggy #git 2019-12-01

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-12-01

Crocodillian left00:00
tango_ joined00:00
Crocodillian joined00:00
stenno joined00:00
Graypup_ joined00:00
orbyt_ joined00:00
stenno left00:04
smitop joined00:09
akem__ joined00:10
Cabanossi left00:11
cry0 joined00:12
akemhp_ left00:12
altendky left00:13
khisanth__ left00:13
boombatower joined00:14
cry0 left00:18
Cabanossi joined00:24
MACscr left00:26
raven-au left00:31
raven-au joined00:31
khisanth__ joined00:38
awkwardpenguin left00:38
relipse2 joined00:41
steven left00:45
stenno joined00:46
monr0e left00:47
greatgatsby left00:47
fatalhalt left00:49
davimore joined00:50
steven joined00:50
stenno left00:51
Serus left00:53
hendry joined00:53
fatalhalt joined00:55
davimore_ joined00:59
davimore_ left01:00
davimore left01:02
davimore joined01:04
mmattice joined01:04
Serus joined01:08
emmanuelux left01:11
dmc00 left01:12
_salt left01:17
def_jam joined01:17
eb0t_ joined01:17
_salt joined01:18
barteks2x left01:18
eblip left01:18
eb0t left01:19
runningFromEntro left01:24
begui joined01:24
beastDiv_ left01:28
mowcat left01:29
Celelibi joined01:38
qpdbGuest143801:40
Guest1438 left01:40
qpdb joined01:40
Celelibi left01:41
m0viefreak left01:41
Celelibi joined01:51
mitigate joined02:08
mitigate I want to set the current branch to a new ref: git branch -f master <other branch>. but git won't let me update the current branch. That is *exactly* what i wnt to do02:10
i can retain the modified-time timestamps of unchanged files when i do a checkout -f after that02:10
i can workaround it by doing the update an uncheckedout git-new-workdir but it is very demeaning to have git act this way02:11
dre_ joined02:20
dre_ left02:20
thomasross_ joined02:20
thomasross left02:20
thomasross_thomasross02:20
yonder left02:22
salamanderrake joined02:26
relipse2 left02:29
brettgilio joined02:30
thiago left02:30
mitigate left02:31
g4570n left02:33
iam730 left02:36
finalbeta left02:37
iam730 joined02:38
thomasross_ joined02:39
thomasrossGuest5754102:39
thomasross_thomasross02:39
Guest57541 left02:39
beastDiv_ joined02:45
altendky joined02:46
raven-au left02:47
magic_ninja left02:47
finalbeta joined02:48
magic_ninja joined02:48
iam730 left02:50
raven-au joined02:50
F0rTex left02:51
F0rTex joined02:53
raven-au left02:57
raven-au joined02:57
mitigate joined03:01
raven-au left03:02
mitigate is "git branch -f current-branch target-branch" === "git-update-ref refs/heads/current-branch refs/heads/target-branch refs/heads/current-branch" to update the current branch?03:02
raven-au joined03:04
kapil_ joined03:09
omnireq_ left03:11
lagothrixGuest6612603:12
Guest66126 left03:12
lagothrix joined03:12
omnireq_ joined03:13
salamanderrake left03:14
Cabanossi left03:15
Cabanoss- joined03:24
vicfred joined03:28
raven-au left03:30
dartmouthed left03:31
raven-au joined03:35
iam730 joined03:35
cbreak left03:39
cbreak joined03:40
mitigate left03:45
feodoran_ joined03:45
feodoranGuest8789803:45
raven-au left03:46
feodoran_feodoran03:46
raven-au joined03:46
thomasross_ joined03:47
thomasrossGuest9528603:47
thomasross_thomasross03:47
relipse2 joined03:48
Guest87898 left03:49
ghostlines joined03:49
Guest95286 left03:49
magic_ninja left03:50
relipse2 left03:52
Newami joined03:52
omnireq_ left03:53
Newami left03:53
omnireq_ joined03:53
beastDiv_ left03:55
beastDiv_ joined04:05
smitop left04:09
beastDiv_ left04:10
thomasross left04:10
beastDiv_ joined04:11
zlogan2003 joined04:12
zlogan left04:14
snowkidimd joined04:16
yonder joined04:24
boombatower left04:28
fatalhalt left04:30
Prestige left04:34
fatalhalt joined04:34
fatalhalt left04:38
justanotheruser left04:39
gioyik joined04:41
jelmer left04:42
jelmer joined04:43
iamthevisitor joined04:45
cd left04:49
fatalhalt joined04:51
realies left05:01
pks_ joined05:01
pks left05:02
pks_pks05:02
im0nde_ joined05:04
im0nde left05:05
realies joined05:08
buckworst joined05:12
buckworst left05:12
buckworst joined05:14
iam730 left05:17
bvdw left05:19
bvdw joined05:19
thiago joined05:25
iamthevisitor left05:25
bket left05:28
ChrisLane left05:33
ChrisLane joined05:36
robertparkerx left05:38
robertparkerx joined05:38
robertparkerx left05:40
robertparkerx joined05:41
iamthevisitor joined05:45
Milos left05:49
barteks2x joined05:49
iamthevisitor left05:52
iamthevisitor joined05:52
fatalhalt left05:55
thiago left05:58
fassl left05:59
jim cant I "git status" on a bare repo?06:03
s/cant/can/06:03
relipse2 joined06:05
Goplat left06:06
Eugene You can sure !tryit but it won't do much without a worktree attached to the repo, no.06:07
gitinfo [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.06:07
thomasross joined06:09
jim Eugene, well I did already, I had a repo in a dir like something.git, so I did git status something.git06:09
and, error.06:10
bket joined06:10
jim the error was, fatal: Not a git repository (or any parent up to mount point /home)06:10
Rboreal_Frippery left06:10
jim so I guess the answer is you can't get the status of a bare repo06:11
stenno joined06:12
bket left06:12
iamthevisitor left06:12
iamthevisitor joined06:12
bket joined06:13
jim so I cloned it, and got the status of that... no commits yet06:14
Eugene Actually that error is from not running it 'inside' of something.git; you would get "This operation must be run in a work tree"06:14
nano11bravo joined06:14
jim understood... and, something.git happens to be a bare repo in there06:15
I could try that06:15
orbyt_ left06:16
stenno left06:16
Eugene But the point is, git status is meaningless without a worktree (which is what a 'bare repo' is: a work-tree-less repo), there's nothing to be status-checked, obviously.06:16
So, error06:17
jim yep I see thatr06:17
ok, is there any way of getting info about a bare repo?06:17
other than cloning it, can I for example get its logs?06:18
Eugene Sure, `git branch -vv` will tell you all sorts of things. Or you can run `git ls-remote` against it06:18
Or something like `git --work-tree=/foo/bar checkout HEAD`06:19
jim do I have to be in a nonbare repo's working dir?06:19
Eugene Nope; branch doesn't require a worktree. ls-remote can be generically invoked against any valid URI (including a filesystem path) too.06:20
man git; see the "interrogation commands" section06:21
gitinfo the git manpage is available at https://gitirc.eu/git.html06:21
Eugene The question becomes: what info do you want about a bare repo? ;-)06:22
localhorse left06:22
jim again, for example, the log06:23
really, to know if the repo is empty06:24
relipse2 left06:24
jim (now having said that, I did find out for something.git)06:24
Eugene Sure, you can run !lol or any variant thereof. If you're looking for something for a script, a better test would be something like: `git rev-parse HEAD`. If that returns a SHA, chances are good there is some content in the repository - but to be certain you'd really have to start walking the objects/ directory06:26
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all06:26
markzen left06:31
milkt_ joined06:40
milkt left06:40
jim ok, here's something maybe interesting... when I started the repo, there were directories that were siblings, and when I did git status, it only showed the dir as being not added to the index, and I guess that's because there were no files in that dir that were ever tracked... cd into that dir, git status, sure enough, says ./ not added to index06:43
then,06:43
Wetmelon left06:44
jim as soon as I add a file in that dir, the git status shows files in that dir (whereas it didn't before)06:44
could this be because there's not a directory object (tree object?) for that dir?06:44
and that dir object gets created when I git add thatDir/someFile?06:45
gioyik left06:55
Decobus left06:56
Decobus_ joined06:56
Wetmelon joined07:06
Wetmelon left07:12
Bcadren joined07:20
Bcadren Uhh how do I get git to add a specific file again? The file is called monuse-flags.h (C++ Header) I've tried ``git add monuse-flags`` and ``git add monuse-flags.h``07:20
beenusing -u so long I forgot07:23
shabius_ joined07:25
BtbN_ joined07:25
rishi left07:27
stfn left07:27
Blkt left07:27
BtbN_BtbN07:27
Nickeeh joined07:27
shabius left07:28
veremitz joined07:28
Blkt joined07:28
stfn joined07:29
Learath2 joined07:31
Heirlung left07:40
reprazent joined07:40
Bcadren left07:43
raven-au left07:44
zerogue joined07:44
raven-au_ joined07:45
Heirlung joined07:45
raven-au_raven-au07:45
alfredb joined07:48
alfredb left08:02
buckworst left08:02
Heirlung left08:04
MACscr joined08:04
fflam left08:07
Heirlung joined08:09
crose left08:12
warthog9 left08:13
fflam joined08:14
warthog9 joined08:18
feriman joined08:19
dionysus69 joined08:20
nullniverse left08:21
milkt_ left08:21
milkt joined08:22
ferdna left08:42
causasui left08:48
karab44 joined08:54
mat001 left08:54
dijitol joined09:02
Mattiaslndstrm left09:02
Milos joined09:03
LearnAllTheTime joined09:05
mikami joined09:08
karab44 left09:13
kimiamania left09:15
gareppa joined09:15
kimiamania joined09:15
Saw joined09:19
Saw Can anyone explain quickly what's the benefit of using git-lfs? I understand it uses a text file in the base git repository so the file won't be cloned every time it changes - but how does it handle the file to the lfs endpoint? changes, that is? Is it some binary diff? or what?09:20
dionysus69 left09:21
polman joined09:24
Milos left09:25
Milos joined09:26
polman left09:28
polman joined09:29
foul_owl_ joined09:32
polman left09:35
karab44 joined09:37
polman joined09:37
karab44 left09:38
foul_owl_ left09:42
Fernando-Basso joined09:43
Olipro left09:45
polman left09:48
Olipro joined09:50
Raging_Hog joined09:51
polman joined09:51
bladane joined09:51
karab44 joined09:52
polman left09:55
foul_owl_ joined09:55
luckman212_ left10:00
luckman212 joined10:00
maurer git lfs and similar systems are used so that a clone of the repository does not need to contain every asset revision ever committed10:09
So if, for example, you're building a game and you are committing art assets to your git repository, you won't need every version of the texture ever produced when you clone, just whatever ones are needed for your checkout10:10
dionysus69 joined10:14
polman joined10:16
Mattiaslndstrm joined10:17
Mattiaslndstrm left10:20
dionysus69 left10:21
Saw ok, but will git lfs also keep history like git? that is, if a 100mb binary file changed in 5 commits - it will take up 500mb, the same as git? (If I understood it correctly)10:22
Raging_Hog left10:25
fling left10:28
polman left10:31
kjartan_ joined10:33
kjartan left10:35
mniip left10:42
fling joined10:43
j416 joined10:46
beastDiv_ left10:48
random_yanek left10:50
wootehfoot joined10:52
TheFuzzball joined10:54
Inline left10:54
Inline joined10:56
random_yanek joined10:57
stenno joined11:00
polman joined11:03
gareppa left11:05
m0viefreak joined11:11
reprazent left11:12
bladane left11:13
polman left11:13
reprazent joined11:13
reprazent left11:17
bvdw left11:18
emmanuelux joined11:19
bvdw joined11:19
Mattiaslndstrm joined11:26
Shentino left11:27
Shentino joined11:28
Shentino left11:28
Shentino joined11:29
polman joined11:35
polman left11:39
polman joined11:42
polman left11:42
Saw left11:44
mArtale joined11:46
mArtale left11:46
haralambov joined11:50
zlogan2003 left11:51
vishal left12:08
Mattiaslndstrm left12:10
vishal joined12:10
Viridian joined12:10
justanotheruser joined12:14
snowkidimd left12:19
Mattiaslndstrm joined12:20
Inline left12:22
Inline joined12:24
dartmouthed joined12:28
Inline left12:36
Inline joined12:38
jstein joined12:38
haralambov left12:40
greatgatsby joined12:40
roxlu hey, I've got a repository and I created two feature branches. Now I want to use both of these features in a project that uses this repository as a dependency. Would it be "ok" to create a new branch that merges both of the feature branches?12:43
_ikke_ roxlu: I don't see why note12:44
not*12:44
roxlu ok, was curious if this is a common approach or if there are maybe different/better solutions12:46
_ikke_ it depends a lot on your coplete workflow12:47
roxlu yeah I see12:47
wildlander joined12:53
reprazent joined12:55
feriman left13:01
zlogan joined13:03
_ADN_ joined13:06
mowcat joined13:07
Human_G33k joined13:21
Human_G33k left13:22
ojdo joined13:22
Human_G33k joined13:22
HumanG33k left13:24
akem__akem13:26
mniip joined13:32
vicfred left13:35
ojdo left13:38
brettgilio left13:38
rustyshackleford left13:39
polman joined13:44
Aelius left13:45
ojdo joined13:46
mowcat left13:52
beastDiv_ joined13:57
ojdo left13:58
karab44 left14:01
polman left14:02
polman joined14:02
bvdw left14:06
bvdw joined14:06
reprazent left14:07
Aquazi joined14:08
mat001 joined14:09
Phylock joined14:21
polman left14:26
mowcat joined14:28
Anthaas left14:28
Anthaas joined14:32
TheFuzzball left14:42
jottr joined14:45
rardiol left14:48
g4570n joined14:53
salamanderrake joined14:53
vrih left14:56
LearnAllTheTime left14:57
TheFuzzball joined15:01
vrih joined15:02
dmc left15:02
brettgilio joined15:03
Flaghacker joined15:16
jottr_ joined15:18
jottr left15:21
salamanderrake left15:21
pspace joined15:22
truthseeker_ joined15:23
publio joined15:23
pspace left15:27
maxwilliamson left15:30
maxwilli- joined15:30
barteks2x left15:39
monr0e joined15:43
mikami left15:43
davispuh joined15:44
m0viefreak left15:44
gopper joined15:46
cry0 joined15:49
TheFuzzball left15:52
Aelius joined15:52
TheFuzzball joined15:53
fflam left15:53
Aelius left15:55
learningc left15:59
davispuh left16:01
ph88 left16:03
fassl joined16:05
davispuh joined16:08
hqdruxn08__ joined16:10
Cabanoss- left16:11
eoli3n left16:12
Goplat joined16:13
azwieg103 joined16:14
hqdruxn08_ left16:14
Flaghacker left16:14
Cabanossi joined16:15
greatgatsby left16:15
nowhere_man left16:15
thiago joined16:17
greatgatsby joined16:18
royal_screwup21 joined16:30
Wetmelon joined16:30
snowkidimd joined16:34
fflam joined16:36
polman joined16:37
crose joined16:38
cry0 left16:43
CryptoDavid joined16:44
fission6 joined16:44
roadie joined16:47
cd joined16:49
feriman joined16:54
fphilipe left16:54
fflam left17:00
sahasatvik joined17:01
citizen-stig joined17:04
themayor joined17:05
polman left17:06
wgrant joined17:08
Moongoodenby left17:11
jorj left17:11
tkazi left17:11
renatogeh left17:11
bin_bash left17:11
redrabbit left17:11
evil-god left17:11
moviuro left17:11
forrestv left17:11
RoseBus left17:11
siqueira left17:11
nikow left17:11
Xat` left17:11
ashka left17:11
utrack left17:11
gsingh93 left17:11
apragmatist left17:11
ashnur left17:11
freezing left17:11
taubi19 left17:11
sssilver left17:11
RiPer left17:11
justinmrkva left17:11
mirko left17:11
lu_zero left17:11
joeytwiddle left17:11
jscob left17:11
stevenbenner left17:11
nsh left17:11
tijensse left17:11
maxwilli- left17:11
milkt left17:11
gpanders_ left17:11
tryte left17:11
Hello71 left17:11
xelxebar left17:11
Hoffman left17:11
ghost43 left17:11
iNs left17:11
cpackham left17:11
MaliusArth[m] left17:11
execat[m] left17:11
feriman left17:11
roadie left17:11
fission6 left17:11
royal_screwup21 left17:11
azwieg103 left17:11
Human_G33k left17:11
luckman212 left17:11
foul_owl_ left17:11
Milos left17:11
warthog9 left17:11
iamthevisitor left17:11
ChrisLane left17:11
pks left17:11
feodoran left17:11
F0rTex left17:11
mmattice left17:11
hendry left17:11
steven left17:11
Crocodillian left17:11
mven left17:11
is_null left17:11
spacesuitdiver left17:11
magic_ninja_work left17:11
PaulePanter left17:11
cdown left17:11
zulutango left17:11
hvxgr left17:11
edwardly left17:11
heroux left17:11
chachasmooth left17:11
cim209 left17:11
lempamo left17:11
dino82 left17:11
craftyguy left17:11
staafl__ left17:11
caffeinatedcode left17:11
matheustavares left17:11
iokill left17:11
gavlee_ left17:11
kreyren left17:11
wyre left17:11
INeedAHandle left17:11
omry left17:11
NightMonkey left17:11
Wes- left17:11
Raimondi left17:11
foo left17:11
afk left17:11
Novae left17:11
sponge5 left17:11
vdl left17:11
SleePy left17:11
jtmusky left17:11
iloop left17:11
jakobvarmose left17:11
guardian left17:11
sunri5e left17:11
begui left17:11
markmarkmark left17:11
nero left17:11
ZachGibbens left17:11
Xeago left17:11
Arguggi left17:11
giaco left17:11
Abbott left17:11
dskull left17:11
staafl_r19 left17:11
wolfshappen left17:11
rwp left17:11
anddam left17:11
jayjo left17:11
sborza left17:11
cYmen left17:11
gpp left17:11
LeMike left17:11
cd left17:11
Goplat left17:11
davispuh left17:11
TheFuzzball left17:11
monr0e left17:11
vrih left17:11
Anthaas left17:11
mowcat left17:11
Phylock left17:11
Mattiaslndstrm left17:11
Shentino left17:11
wootehfoot left17:11
kimiamania left17:11
MACscr left17:11
ghostlines left17:11
finalbeta left17:11
def_jam left17:11
khisanth__ left17:11
tango_ left17:11
Codaraxis left17:11
plitter left17:11
BenderRodriguez left17:11
doug16k left17:11
Nokurn left17:11
thefatbird left17:11
nuala left17:11
yawkat left17:11
Ekho left17:11
jcbitter left17:11
escherial left17:11
_xor left17:11
rigid left17:11
wodim left17:11
dziadu left17:11
tchan left17:11
diogenese left17:11
Lunatrius left17:11
errr_ left17:11
prg318 left17:11
murr4y left17:11
EdFletcherT137 left17:11
cadabrax left17:11
gordonfish left17:11
snits left17:11
perrier-jouet left17:11
Thorn left17:11
haasn left17:11
Disconsented left17:11
Kamilion left17:11
R2robot left17:11
netmonk left17:11
arekm left17:11
citizen-stig left17:11
wildlander left17:11
emmanuelux left17:11
kjartan_ left17:11
zerogue left17:11
shabius_ left17:11
lagothrix left17:11
qpdb left17:11
eb0t_ left17:11
Atlenohen left17:11
alexandre9099 left17:11
DolphinDream left17:11
hussam left17:11
n000g left17:11
Stoot left17:11
shored left17:11
to1ne left17:11
Cork left17:11
konrados left17:11
shokohsc left17:11
pikapika left17:11
c0san0stra left17:11
psprint left17:11
goldleader left17:11
adam12 left17:11
quesker left17:11
deltab left17:11
j7k6 left17:11
Case_Of left17:11
no_maam left17:11
boshhead left17:11
kent\n left17:11
evertvdb left17:11
Kartagis left17:11
xcm left17:11
alip left17:11
SuperLag left17:11
xnaas left17:11
lebster left17:11
fury left17:11
Manouchehri left17:11
g2anj left17:11
ghoti left17:11
holdsworth left17:11
tonyj left17:11
Xiti left17:11
BlessJah left17:11
LiENUS left17:11
linuxdaemon left17:11
plasticle left17:11
sentriz left17:11
|Fitz| left17:11
Seveas left17:11
Qizzy left17:11
themayor left17:11
Belliash left17:11
_W_ left17:11
crose left17:11
CryptoDavid left17:11
snowkidimd left17:11
Wetmelon left17:11
Aquazi left17:11
mniip left17:11
Olipro left17:11
Learath2 left17:11
Nickeeh left17:11
Ionic left17:11
Yoginth left17:11
uplime left17:11
Jackneill left17:11
prit left17:11
gpanders[m] left17:11
nikivi left17:11
kini left17:11
gdrc left17:11
fahadash left17:11
KennosiS left17:11
wagle left17:11
dka left17:11
waveclaw left17:11
caveman left17:11
Eugene left17:11
tgunr left17:11
sns left17:11
OvermindDL1 left17:11
OnkelTem left17:11
yn left17:11
coldaemon1 left17:11
infl00p68 left17:11
elibrokeit left17:11
heftig left17:11
qqx left17:11
nius left17:11
doppo left17:11
wgrant left17:11
greatgatsby left17:11
gopper left17:11
truthseeker_ left17:11
g4570n left17:11
beastDiv_ left17:11
vishal left17:11
fling left17:11
Heirlung left17:11
Decobus_ left17:11
bket left17:11
thomasross left17:11
yonder left17:11
cbreak left17:11
Celelibi left17:11
_salt left17:11
Serus left17:11
davimore left17:11
akem left17:11
Graypup_ left17:11
dviola left17:11
babilen left17:11
mns left17:11
swalladge left17:11
misuto left17:11
ablackack left17:11
neckutrek left17:11
BonusPlay left17:11
CalimeroTeknik left17:11
d^sh left17:11
sauvin left17:11
rwb left17:11
lightstalker left17:11
esotericnonsense left17:11
andres_ left17:11
filcab left17:11
stux|RC left17:11
flaviodesousa left17:11
rewt left17:11
ndorf left17:11
lem-fr left17:11
lankanmon left17:11
m1dnight_ left17:11
rkta left17:11
lunaphyte left17:11
cluelessperson_ left17:11
Sigma left17:11
Mindi left17:11
yuljk left17:11
Murr left17:11
Zohnuqu3pah5iejo left17:11
sunrunner20 left17:11
Stummi left17:11
shalok left17:11
cdunklau left17:11
mika left17:11
rmsvc left17:11
equwal left17:11
de-vri-es left17:11
dilfridge left17:11
Rhonda left17:11
tazle_ left17:11
tmz left17:11
penguwin left17:11
ezio left17:11
surial left17:11
gurrkiin left17:11
publio left17:11
johnny56_ left17:11
obiwahn left17:11
bookworm left17:11
leah2 left17:11
Eryn_1983_FL left17:11
williamboman left17:11
mgedmin left17:11
Kulrak left17:11
hqdruxn08__ left17:11
a3Dman left17:11
scivola left17:11
crater2150 left17:11
Nazral left17:11
Peng_ left17:11
ghormoon left17:11
nkuttler left17:11
Inline left17:11
tomaw left17:11
jplatte left17:11
Celmor[m] left17:11
Muzer left17:11
roxlu left17:11
ephemer0l left17:11
ToBeCloud left17:11
riotz left17:11
d1rewolf left17:11
_cyril_ left17:11
thiago left17:11
brettgilio left17:11
bvdw left17:11
dartmouthed left17:11
stenno left17:11
random_yanek left17:11
stfn left17:11
Blkt left17:11
BtbN left17:11
robertparkerx left17:11
realies left17:11
im0nde_ left17:11
omnireq_ left17:11
oprypin left17:11
fstd left17:11
Trieste left17:11
devzero left17:11
lacrymology left17:11
steven__ left17:11
fxrs left17:11
SilentGhost left17:11
dansan left17:11
kantlivelong left17:11
Kaivo left17:11
sinhue left17:11
Spr0cket left17:11
diverger left17:11
rickbutton left17:11
Behold left17:11
inkbottle left17:11
tanuki left17:11
doublex left17:11
svm_invictvs left17:11
n1ax left17:11
miklcct left17:11
ixian left17:11
z14 left17:11
ilmostro left17:11
llinguini left17:11
synx left17:11
rjsalts left17:11
selckin left17:11
Forkk left17:11
circuitbone left17:11
EvilJStoker left17:11
PacKetSlayer left17:11
lupine left17:11
noodle left17:11
teej left17:11
beaky left17:11
knobo left17:11
johill left17:11
olbat[m] left17:11
midnight left17:11
Cabanossi left17:11
_ADN_ left17:11
zlogan left17:11
justanotheruser left17:11
Viridian left17:11
j416 left17:11
Fernando-Basso left17:11
dijitol left17:11
raven-au left17:11
jelmer left17:11
ToBeFree left17:11
leeN left17:11
nitrix left17:11
epoll left17:11
caskd left17:11
axisys left17:11
henrebotha[m] left17:11
Pseudonosaur left17:11
DamienCassou left17:11
donofrio left17:11
storrgie left17:11
squirrel left17:11
Timvde left17:11
seanBE left17:11
jleclanche left17:11
quizzi left17:11
Kaisyu7 left17:11
Ragnor left17:11
deltam left17:11
nasamuffin_ left17:11
Bombe left17:11
POQDavid left17:11
brnzz left17:11
stigz left17:11
stutter left17:11
DarthRadar left17:11
jwest left17:11
Habbie left17:11
timthowtdi left17:11
MylesBorins left17:11
MichaelRomig left17:11
NitrousPG left17:11
i7c left17:11
tsprlng left17:12
wgrant joined17:12
themayor joined17:12
citizen-stig joined17:12
feriman joined17:12
cd joined17:12
roadie joined17:12
fission6 joined17:12
CryptoDavid joined17:12
crose joined17:12
snowkidimd joined17:12
Wetmelon joined17:12
royal_screwup21 joined17:12
greatgatsby joined17:12
thiago joined17:12
Cabanossi joined17:12
azwieg103 joined17:12
Goplat joined17:12
hqdruxn08__ joined17:12
davispuh joined17:12
TheFuzzball joined17:12
gopper joined17:12
monr0e joined17:12
maxwilli- joined17:12
publio joined17:12
truthseeker_ joined17:12
brettgilio joined17:12
vrih joined17:12
g4570n joined17:12
Anthaas joined17:12
mowcat joined17:12
Phylock joined17:12
Aquazi joined17:12
bvdw joined17:12
beastDiv_ joined17:12
mniip joined17:12
Human_G33k joined17:12
_ADN_ joined17:12
zlogan joined17:12
wildlander joined17:12
Inline joined17:12
dartmouthed joined17:12
Mattiaslndstrm joined17:12
justanotheruser joined17:12
Viridian joined17:12
vishal joined17:12
Shentino joined17:12
emmanuelux joined17:12
stenno joined17:12
random_yanek joined17:12
wootehfoot joined17:12
j416 joined17:12
fling joined17:12
kjartan_ joined17:12
luckman212 joined17:12
foul_owl_ joined17:12
Olipro joined17:12
Fernando-Basso joined17:12
Milos joined17:12
kimiamania joined17:12
dijitol joined17:12
milkt joined17:12
warthog9 joined17:12
Heirlung joined17:12
MACscr joined17:12
raven-au joined17:12
zerogue joined17:12
Learath2 joined17:12
stfn joined17:12
Blkt joined17:12
Nickeeh joined17:12
BtbN joined17:12
shabius_ joined17:12
Decobus_ joined17:12
bket joined17:12
iamthevisitor joined17:12
thomasross joined17:12
robertparkerx joined17:12
ChrisLane joined17:12
realies joined17:12
im0nde_ joined17:12
pks joined17:12
jelmer joined17:12
yonder joined17:12
omnireq_ joined17:12
ghostlines joined17:12
feodoran joined17:12
cbreak joined17:12
lagothrix joined17:12
F0rTex joined17:12
finalbeta joined17:12
Celelibi joined17:12
qpdb joined17:12
begui joined17:12
_salt joined17:12
eb0t_ joined17:12
def_jam joined17:12
Serus joined17:12
mmattice joined17:12
davimore joined17:12
hendry joined17:12
steven joined17:12
khisanth__ joined17:12
akem joined17:12
Graypup_ joined17:12
Crocodillian joined17:12
tango_ joined17:12
oprypin joined17:12
Codaraxis joined17:12
ToBeFree joined17:12
plitter joined17:12
Eugene joined17:12
mven joined17:12
is_null joined17:12
tomaw joined17:12
Atlenohen joined17:12
BenderRodriguez joined17:12
fstd joined17:12
obiwahn joined17:12
Trieste joined17:12
doug16k joined17:12
alexandre9099 joined17:12
dviola joined17:12
DolphinDream joined17:12
babilen joined17:12
devzero joined17:12
gpanders_ joined17:12
Nokurn joined17:12
mns joined17:12
lacrymology joined17:12
thefatbird joined17:12
nuala joined17:12
leeN joined17:12
steven__ joined17:12
wodim joined17:12
spacesuitdiver joined17:12
magic_ninja_work joined17:12
fxrs joined17:12
PaulePanter joined17:12
tryte joined17:12
Hello71 joined17:12
cdown joined17:12
johnny56_ joined17:12
surial joined17:12
SilentGhost joined17:12
hussam joined17:12
Ionic joined17:12
zulutango joined17:12
evertvdb joined17:12
jscob joined17:12
joeytwiddle joined17:12
lu_zero joined17:12
justinmrkva joined17:12
RiPer joined17:12
sssilver joined17:12
ashnur joined17:12
apragmatist joined17:12
taubi19 joined17:12
gsingh93 joined17:12
utrack joined17:12
freezing joined17:12
ashka joined17:12
nikow joined17:12
Xat` joined17:12
mirko joined17:12
forrestv joined17:12
evil-god joined17:12
redrabbit joined17:12
bin_bash joined17:12
tkazi joined17:12
renatogeh joined17:12
moviuro joined17:12
jorj joined17:12
RoseBus joined17:12
siqueira joined17:12
Moongoodenby joined17:12
dansan joined17:12
n000g joined17:12
EdFletcherT137 joined17:12
swalladge joined17:12
hvxgr joined17:12
xelxebar joined17:12
Hoffman joined17:12
ghost43 joined17:12
iNs joined17:12
Yoginth joined17:12
nitrix joined17:12
yawkat joined17:12
Stoot joined17:12
edwardly joined17:12
Ekho joined17:12
jcbitter joined17:12
shored joined17:12
misuto joined17:12
kantlivelong joined17:12
epoll joined17:12
Kaivo joined17:12
ablackack joined17:12
neckutrek joined17:12
to1ne joined17:12
sinhue joined17:12
caskd joined17:12
CalimeroTeknik joined17:12
escherial joined17:12
heroux joined17:12
uplime joined17:12
Jackneill joined17:12
Spr0cket joined17:12
prit joined17:12
chachasmooth joined17:12
psprint joined17:12
BonusPlay joined17:12
_xor joined17:12
cim209 joined17:12
lempamo joined17:12
Belliash joined17:12
Cork joined17:12
rigid joined17:12
konrados joined17:12
shokohsc joined17:12
dziadu joined17:12
axisys joined17:12
diverger joined17:12
dino82 joined17:12
d^sh joined17:12
gpanders[m] joined17:12
henrebotha[m] joined17:12
execat[m] joined17:12
Pseudonosaur joined17:12
DamienCassou joined17:12
olbat[m] joined17:12
cpackham joined17:12
Celmor[m] joined17:12
rickbutton joined17:12
MaliusArth[m] joined17:12
jplatte joined17:12
OnkelTem joined17:12
Behold joined17:12
storrgie joined17:12
cadabrax joined17:12
gdrc joined17:12
penguwin joined17:12
pikapika joined17:12
nikivi joined17:12
inkbottle joined17:12
sauvin joined17:12
c0san0stra joined17:12
craftyguy joined17:12
tanuki joined17:12
doublex joined17:12
squirrel joined17:12
staafl__ joined17:12
tchan joined17:12
rwb joined17:12
diogenese joined17:12
nsh joined17:12
tijensse joined17:12
stevenbenner joined17:12
lightstalker joined17:12
svm_invictvs joined17:12
Timvde joined17:12
esotericnonsense joined17:12
n1ax joined17:12
kini joined17:12
goldleader joined17:12
adam12 joined17:12
Lunatrius joined17:12
errr_ joined17:12
prg318 joined17:12
andres_ joined17:12
quesker joined17:12
caffeinatedcode joined17:12
matheustavares joined17:12
filcab joined17:12
murr4y joined17:12
stux|RC joined17:12
fahadash joined17:12
giaco joined17:12
iokill joined17:12
gavlee_ joined17:12
deltab joined17:12
j7k6 joined17:12
johill joined17:12
kreyren joined17:12
flaviodesousa joined17:12
Kulrak joined17:12
rewt joined17:12
Case_Of joined17:12
KennosiS joined17:12
wyre joined17:12
seanBE joined17:12
ndorf joined17:12
lem-fr joined17:12
INeedAHandle joined17:12
a3Dman joined17:12
foo joined17:12
gordonfish joined17:12
snits joined17:12
netmonk joined17:12
jleclanche joined17:12
no_maam joined17:12
miklcct joined17:12
ixian joined17:12
gpp joined17:12
quizzi joined17:12
perrier-jouet joined17:12
Thorn joined17:12
haasn joined17:12
omry joined17:12
wagle joined17:12
Disconsented joined17:12
Kamilion joined17:12
z14 joined17:12
Kaisyu7 joined17:12
NightMonkey joined17:12
Ragnor joined17:12
Wes- joined17:12
dka joined17:12
Raimondi joined17:12
lankanmon joined17:12
m1dnight_ joined17:12
waveclaw joined17:12
caveman joined17:12
boshhead joined17:12
deltam joined17:12
rkta joined17:12
_W_ joined17:12
afk joined17:12
nasamuffin_ joined17:12
lunaphyte joined17:12
cluelessperson_ joined17:12
Novae joined17:12
Sigma joined17:12
kent\n joined17:12
Bombe joined17:12
POQDavid joined17:12
Kartagis joined17:12
Mindi joined17:12
yuljk joined17:12
ilmostro joined17:12
xcm joined17:12
tgunr joined17:12
alip joined17:12
bookworm joined17:12
SuperLag joined17:12
R2robot joined17:12
leah2 joined17:12
brnzz joined17:12
sns joined17:12
xnaas joined17:12
sponge5 joined17:12
vdl joined17:12
Murr joined17:12
Eryn_1983_FL joined17:12
williamboman joined17:12
Zohnuqu3pah5iejo joined17:12
midnight joined17:12
llinguini joined17:12
lebster joined17:12
fury joined17:12
Manouchehri joined17:12
SleePy joined17:12
stigz joined17:12
stutter joined17:12
DarthRadar joined17:12
g2anj joined17:12
jtmusky joined17:12
ghoti joined17:12
iloop joined17:12
jakobvarmose joined17:12
OvermindDL1 joined17:12
sunrunner20 joined17:12
Abbott joined17:12
guardian joined17:12
jwest joined17:12
synx joined17:12
sunri5e joined17:12
Stummi joined17:12
rjsalts joined17:12
yn joined17:12
Habbie joined17:12
markmarkmark joined17:12
coldaemon1 joined17:12
shalok joined17:12
cdunklau joined17:12
mika joined17:12
rmsvc joined17:12
nero joined17:12
holdsworth joined17:12
ZachGibbens joined17:12
equwal joined17:12
infl00p68 joined17:12
Xeago joined17:12
heftig joined17:12
elibrokeit joined17:12
qqx joined17:12
Peng_ joined17:12
tonyj joined17:12
de-vri-es joined17:12
Xiti joined17:12
nius joined17:12
selckin joined17:12
cYmen joined17:12
roxlu joined17:12
Arguggi joined17:12
Forkk joined17:12
Nazral joined17:12
mgedmin joined17:12
dilfridge joined17:12
BlessJah joined17:12
timthowtdi joined17:12
Rhonda joined17:12
dskull joined17:12
circuitbone joined17:12
MylesBorins joined17:12
EvilJStoker joined17:12
staafl_r19 joined17:12
Muzer joined17:12
tazle_ joined17:12
LiENUS joined17:12
ezio joined17:12
PacKetSlayer joined17:12
tmz joined17:12
LeMike joined17:12
linuxdaemon joined17:12
gurrkiin joined17:12
arekm joined17:12
plasticle joined17:12
sentriz joined17:12
|Fitz| joined17:12
wolfshappen joined17:12
doppo joined17:12
rwp joined17:12
Seveas joined17:12
anddam joined17:12
jayjo joined17:12
lupine joined17:12
sborza joined17:12
Qizzy joined17:12
stux|RC-only joined17:12
dustinm joined17:12
ravndal joined17:12
d1b joined17:12
strudla joined17:12
GGMethos joined17:12
simon816 joined17:12
grumble joined17:12
timwis joined17:12
sweatsuit joined17:12
Defcronyke joined17:12
aesthetik joined17:12
lmariscal joined17:12
freakyy joined17:12
polyrob joined17:12
envex joined17:12
SCHAPiE joined17:12
Dewin joined17:12
muhaha joined17:12
APic joined17:12
captain42 joined17:12
ajain joined17:12
crooked joined17:12
weylin joined17:12
qguv joined17:12
anderson_ joined17:12
Orphis joined17:12
olbat joined17:12
LordRyan joined17:12
bttf joined17:12
laerte joined17:12
raz joined17:12
niven.freenode.net set mode: +v17:12
totte joined17:12
codedmart joined17:12
Rovanion joined17:12
tabakhase joined17:12
immae joined17:12
imMute joined17:12
javaJake joined17:12
qgTG joined17:12
naf joined17:12
lucasseikioshiro joined17:12
kandinski joined17:12
michael_mbp joined17:12
synthmeat joined17:12
AllenJB joined17:12
mearon joined17:12
tureba joined17:12
hagabaka joined17:12
karoshi joined17:12
SporkWitch joined17:12
mithro joined17:12
Kaisyu joined17:12
Fenhl joined17:12
d10n-work joined17:12
Nizumzen joined17:12
yena joined17:12
hsiktas joined17:12
lineos joined17:12
drupol joined17:12
matti joined17:12
kutenai joined17:12
lolmac joined17:12
rknLA joined17:12
rfv joined17:12
amiti joined17:12
cebor joined17:12
Hobbyboy joined17:12
uebera|| joined17:12
jhill joined17:12
justache joined17:12
KnownSyntax joined17:12
LasseVK joined17:12
worstadmin joined17:12
goez joined17:12
JackMc joined17:12
amosbird joined17:12
SJr joined17:12
sitaram joined17:12
Kronuz joined17:12
Ranhir joined17:12
fuchstronaut joined17:12
cyberpear joined17:12
nemesit|znc joined17:12
cjohnson joined17:12
ZeZu joined17:12
Peng joined17:12
Cathy joined17:12
eldritch joined17:12
ddevault joined17:12
mu joined17:12
fury_ joined17:12
raatiniemi joined17:12
SpeakerToMeat joined17:12
tcsc joined17:12
bittyx joined17:12
DistantStar_ joined17:12
afisher joined17:12
robinsmidsrod joined17:12
Kobaz joined17:12
sjohnson joined17:12
DevAntoine joined17:12
heinrich5991 joined17:12
dexterfoo joined17:12
varesa joined17:12
brethil joined17:12
tjbp joined17:12
slax0r joined17:12
ross` joined17:12
axsuul joined17:12
XVar joined17:12
level3 joined17:12
Ring0` joined17:12
mooasaurus joined17:12
Furai joined17:12
flughafen joined17:12
mweckbecker joined17:12
earthbreaker joined17:12
Ori_B joined17:12
coffeejunk joined17:12
redrambles joined17:12
sphalerite joined17:12
hexnewbie joined17:12
cxc99 joined17:12
jlosito joined17:12
RustyRobot joined17:12
timewalker joined17:12
bleb joined17:12
Dev0n joined17:12
jrm joined17:12
dhollinger joined17:12
riposte joined17:12
madduck joined17:12
BlackMaria joined17:12
dupondje joined17:12
devster joined17:12
Jeebiss joined17:12
PipeItToDevNull joined17:12
ReenignE joined17:12
_ikke_ joined17:12
maurer joined17:12
ahf joined17:12
rudi_s joined17:12
xkr47 joined17:12
carbolymer joined17:12
m0ltar joined17:12
ketas joined17:12
averell joined17:12
lmat joined17:12
Bilge joined17:12
pilcrow joined17:12
teward joined17:12
orzo joined17:12
tshirtman joined17:12
jabular joined17:12
Fusl joined17:12
apetresc joined17:12
ikonia joined17:12
sostenuto joined17:12
Matej8 joined17:12
t2mkn joined17:12
styler2go joined17:12
BrianBlaze joined17:12
fk joined17:12
resetpacket joined17:12
LetoThe2nd joined17:12
astronavt joined17:12
Swant joined17:12
qassim joined17:12
crazyduck joined17:12
fibo_mach joined17:12
dsnow joined17:12
mingdao joined17:12
niven.freenode.net set mode: +v17:12
jim joined17:12
Bigcheese joined17:12
capadesu joined17:12
spuc joined17:12
roflin joined17:12
nioncode joined17:12
aspiers joined17:12
Randy joined17:12
Harzilein joined17:12
kashike joined17:12
batrick joined17:12
benharri joined17:12
flowinho joined17:12
Chaser joined17:12
leprechau joined17:12
ThiefMaster joined17:12
Tahvok joined17:12
infernix joined17:12
arand joined17:12
r3my joined17:12
Soliton joined17:12
dysfigured joined17:12
demize joined17:12
sven^ joined17:12
chrisml joined17:12
ericnoan joined17:12
mricon joined17:12
lurkless joined17:12
luis joined17:12
saorge joined17:12
lohfu joined17:12
eirc joined17:12
ws2k3 joined17:12
arooni joined17:12
harv joined17:12
Aaeriele joined17:12
dakar joined17:12
sangy joined17:12
Jordy joined17:12
davidfetter joined17:12
JWatkins joined17:12
nedbat joined17:12
Cerise joined17:12
Remram joined17:12
Willis joined17:12
vostok4 joined17:12
Fissure joined17:12
trobotham joined17:12
_0x40_ joined17:12
scientes joined17:12
amygara joined17:12
abra0 joined17:12
fr33domlover joined17:12
CheckYourSix joined17:12
colona joined17:12
saidelike joined17:12
MrColumbus joined17:12
mdk joined17:12
yourfate joined17:12
spaceone joined17:12
loc joined17:12
liori joined17:12
zrhoffman joined17:12
sebboh joined17:12
appll joined17:12
artgoeshere joined17:12
jadax joined17:12
thevisitor joined17:12
oh4 joined17:12
shiza joined17:12
valeyard joined17:12
rcn joined17:12
thebetra2 joined17:12
dgw joined17:12
Sp4rKy joined17:12
Spydar joined17:12
brezanac joined17:12
a--m joined17:12
archpc joined17:12
Ram-Z joined17:12
Twey joined17:12
Foxboron joined17:12
renihs joined17:12
mr_ab joined17:12
Peetz0r joined17:12
Exagone313 joined17:12
atomi joined17:12
benoliver999 joined17:12
lavalike joined17:12
maxel_ joined17:12
nshp joined17:12
pulec joined17:12
ribasushi joined17:12
skibo joined17:12
Toucan joined17:12
n-st joined17:12
T4cC0re joined17:12
Chex joined17:12
nuxdie joined17:12
fructose joined17:12
dr_lepper joined17:12
preisi joined17:12
wadadli joined17:12
energizer joined17:12
VectorX joined17:12
Henry151 joined17:12
adamus1red joined17:12
ntnn joined17:12
bremner joined17:12
shana joined17:12
raj joined17:12
steveeJ joined17:12
bitonic joined17:12
punto joined17:12
TheresaJayne joined17:12
rougeth joined17:12
bl0m1 joined17:12
ec joined17:12
sebhoss joined17:12
nuck joined17:12
omnigoat joined17:12
Fabricio20 joined17:12
evanc joined17:12
BinGOs joined17:12
aib joined17:12
mgsk joined17:12
ggherdov joined17:12
hahuang65 joined17:12
rodarmor joined17:12
jor joined17:12
junderw joined17:12
nexxus6 joined17:12
WakiMiko joined17:12
gitinfo joined17:12
deepy joined17:12
DelTree joined17:12
themill joined17:12
_flow_ joined17:12
ruskie joined17:12
kloeri joined17:12
jast joined17:12
niven.freenode.net set mode: +o17:12
fcanela joined17:12
Nothing4You joined17:12
Squarism joined17:12
haymawk joined17:12
acidvegas joined17:12
catern joined17:12
Someguy123 joined17:12
chamunks joined17:12
bond joined17:12
TooLmaN joined17:12
SlashLife joined17:12
segnior joined17:12
reda joined17:12
mrbkap joined17:12
kalbasit joined17:12
tomek joined17:12
hexagoxel joined17:12
_cyril_ joined17:12
beaky joined17:12
d1rewolf joined17:12
riotz joined17:12
crater2150 joined17:12
i7c joined17:12
scivola joined17:12
nkuttler joined17:12
ToBeCloud joined17:12
ephemer0l joined17:12
ghormoon joined17:12
NitrousPG joined17:12
MichaelRomig joined17:12
knobo joined17:12
teej joined17:12
noodle joined17:12
Whiskey joined17:12
Iroha joined17:12
avu joined17:12
niven.freenode.net set mode: +v17:12
donofrio joined17:12
bluezone left17:12
veremitz left17:12
altendky left17:12
hexa- left17:12
unreal left17:12
JanC left17:12
veegee left17:12
kapil_ left17:12
TimWolla joined17:13
donofrio left17:13
JanC joined17:13
unreal joined17:13
hexa- joined17:13
donofrio joined17:13
nano11bravo left17:14
altendky joined17:14
jsatk joined17:14
bluezone joined17:14
PavelB joined17:14
tgunr left17:15
klow joined17:15
kapil_ joined17:15
tgunr joined17:15
SCHAPiE left17:16
TheFuzzball left17:17
bvdw left17:19
veremitz joined17:19
bvdw joined17:19
veegee joined17:20
misuto left17:21
fphilipe joined17:23
mowcat left17:24
SCHAPiE joined17:24
fflam joined17:26
misuto joined17:27
fphilipe left17:28
yonder left17:30
eoli3n_ joined17:31
eoli3n_ hi17:31
gitinfo eoli3n_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.17:31
Celelibi left17:34
SCHAPiE left17:34
yonder joined17:36
m1sosoup joined17:36
fission6 left17:38
citizen-stig left17:41
snowkidimd left17:41
TheFuzzball joined17:42
gopper left17:43
Celelibi joined17:43
TimWolla left17:43
jottr joined17:44
SCHAPiE joined17:44
jottr_ left17:47
TimWolla joined17:51
eoli3n_ is there a simple way to merge, and tell git to always use remote branch17:55
i want to merge dev into master17:55
but i have so many conflicts17:55
_ikke_ git merge -Xtheirs17:55
eoli3n_ i want to always keep dev version17:56
thx _ikke_17:56
is that documented somewhere ?17:56
fphilipe joined17:57
eoli3n_ it fails18:00
_ikke_ man git merge18:00
gitinfo the git-merge manpage is available at https://gitirc.eu/git-merge.html18:00
_ikke_ look for merge strategy options18:00
eoli3n_ _ikke_: http://ix.io/23ji18:02
i just don't want to resolve anything and have my dev as master18:02
fphilipe_ joined18:03
eoli3n_ left conflicts are juste modify/delete how to choose to delete anyway?18:03
_ikke_ why merge in the first place?18:04
eoli3n_ i don't get the question18:04
because i made a dev branch long time ago, now master is obsolete18:04
un just want to merge dev in master18:04
s/un/i18:04
using git mergetool and select delete each times worked18:05
i hope i didn't do any mistake18:05
fphilipe left18:06
thiago do you want to keep *any* of the master changes?18:06
eoli3n_ history, why not, but no18:06
thiago ok, then you want an -s ours merge18:07
git checkout dev; git merge -s ours master18:07
eoli3n_ oh... i didn't theirs ^^18:07
thiago -Xtheirs / -Xours is not the same as -s ours18:07
eoli3n_ ah ok18:07
thiago -X specifies what to do when it conflicts18:08
eoli3n_ lets take a look at documentation18:08
thiago -s ours doesn't conflict18:08
eoli3n_ is what i did the same ?18:08
-Xtheirs, then delete manually left conflict by choosing deleted files18:08
thiago no18:09
eoli3n_ because it seems fine now18:09
thiago the difference is what didn't conflict18:09
royal_screwup21 left18:09
_ikke_ -sours keeps the changes from master, not from dev18:11
-s ours*18:11
just reset master to be equal to dev18:12
thiago which is why I had that git checkout first18:12
_ikke_ if you don't care about the history18:12
eoli3n_ that's strange with -Xtheirs, then delete manually left conflicts18:12
ghostlines left18:12
eoli3n_ i only have 1 diff18:12
git diff master..dev gives18:12
anyway, gives one line less18:13
that's strange18:13
why only on that file18:13
TheFuzzball left18:13
ghostlines joined18:13
thiago git diff and show on a merge only show a dif when the result is different from both sources18:14
orbyt_ joined18:14
thiago if it's equal to either (doesn't matter which), they show nothing18:14
eoli3n_ yeah i get it, but what is strange is why this diff18:14
thiago because the result is different from both parents18:15
eoli3n_ i understand that :) anyway thx, i did a commit to fix this little one18:16
i should rebase my dev branch now18:17
thiago rebase will be ff18:17
eoli3n_ hm i don't get those concept too much, maybe i just need to remove dev branch then recreate it18:18
that's a big commit18:18
https://github.com/eoli3n/dotfiles/commit/9c7e8cfd95e3fa1877d59da558daa485652ba13718:18
kgz joined18:19
thiago deleting and recreating is also the same, in this case18:19
eoli3n_ thx for helping18:19
uplime left18:24
uplime joined18:25
greatgatsby left18:31
citizen-stig joined18:31
fxrs left18:32
fxrs joined18:36
truthseeker_ left18:37
navidr joined18:39
jab416171 joined18:42
sahasatvik left18:42
aw1 joined18:43
ferdna joined18:55
roadie left18:56
Inline left18:57
lucasb joined18:57
aw1_ joined18:59
sq-one joined19:00
polman joined19:01
jottr_ joined19:01
aw1 left19:01
citizen-stig left19:03
jottr left19:04
polman left19:05
polman joined19:06
alfredb joined19:06
uplime left19:07
uplime joined19:07
alfredb left19:09
m0viefreak joined19:10
polman left19:11
polman joined19:12
azwieg103 left19:12
brettgilio left19:16
brettgilio joined19:17
Fernando-Basso left19:17
TheFuzzball joined19:18
xcm left19:21
xcm joined19:21
polman left19:23
polman joined19:24
Mattiaslndstrm left19:27
TheFuzzball left19:28
TheFuzzball joined19:31
Mattiaslndstrm joined19:31
polman left19:31
polman joined19:32
citizen-stig joined19:34
Mattiaslndstrm left19:36
Mattiaslndstrm joined19:36
rardiol joined19:38
polman left19:44
polman joined19:46
jab416171 left19:49
fphilipe_ left19:50
polman left19:53
polman joined19:53
jab416171 joined19:54
causasui joined19:56
TheFuzzball left19:56
polman left19:57
polman joined19:58
polman left20:03
jottr_ left20:03
polman joined20:04
polman left20:08
polman joined20:08
Aelius joined20:12
hexa- left20:16
m0rph joined20:16
m1sosoup left20:17
hexa- joined20:17
TheFuzzball joined20:17
vicfred joined20:18
Newami joined20:22
TheFuzzball left20:23
Newami left20:23
Aelius left20:25
tango_ left20:25
tango_ joined20:25
Aelius joined20:28
Aquazi left20:28
im0nde_im0nde20:31
azwieg103 joined20:31
polman left20:31
polman joined20:32
polman left20:37
polman joined20:37
fatalhalt joined20:38
TheFuzzball joined20:38
reveer joined20:39
TheFuzzball left20:41
polman left20:43
polman joined20:43
TheFuzzball joined20:44
fstd_ joined20:45
fstd left20:49
fstd_fstd20:49
polman left20:49
polman joined20:51
Fernando-Basso joined20:55
Narrat joined20:56
Kaivo left20:57
polman left20:57
polman joined21:05
citizen-stig left21:16
Fernando-Basso left21:17
beastDiv_ left21:17
polman left21:19
polman joined21:20
beastDiv_ joined21:21
azwieg103 left21:25
mowcat joined21:25
polman left21:27
Murr left21:29
polman joined21:32
jcbitter left21:33
polman left21:36
jcbitter joined21:37
polman joined21:38
akemhp joined21:38
akem left21:39
barteks2x joined21:40
akemhp left21:42
n3wborn joined21:43
zulutango left21:44
n3wborn left21:46
n3wborn joined21:47
fphilipe_ joined21:47
n3wborn left21:47
n3wborn joined21:48
polman left21:49
DarthRadar left21:50
TheFuzzball left21:51
DarthRadar joined21:51
fphilipe_ left21:52
n3wborn left21:56
beastDiv_ left22:00
reveer left22:00
zulutango joined22:01
beastDiv_ joined22:02
citizen-stig joined22:02
citizen-stig left22:09
eoli3n_ left22:09
sq-one left22:10
Narrat left22:11
Narrat joined22:13
Goplat left22:17
TheFuzzball joined22:18
TheFuzzball left22:19
eoli3n_ joined22:20
m0rph left22:24
nowhere_man joined22:25
dartmouthed left22:26
localhorse joined22:28
chambln joined22:28
cdown_ joined22:30
cdown left22:32
cdown_cdown22:32
royal_screwup21 joined22:33
zlogan left22:36
n3wborn joined22:38
eoli3n_ left22:39
omnireq_ left22:41
omnireq_ joined22:44
cdown left22:45
begui left22:46
cdown joined22:46
beastDiv_ left22:50
Behold left22:59
dijitol left23:02
feriman left23:02
Behold joined23:02
akemhp joined23:03
omnireq_ left23:03
omnireq_ joined23:03
azwieg103 joined23:04
Aelius left23:07
raatiniemi left23:07
beastDiv_ joined23:07
begui joined23:08
Aelius joined23:09
leeN left23:09
wootehfoot left23:11
Decobus_ left23:12
akemhp_ joined23:13
Decobus joined23:13
akemhp left23:14
buzzlewoo joined23:14
giaco left23:16
bvdw left23:19
robertparkerx left23:19
bvdw joined23:19
maxwilli- left23:24
maxwilliamson joined23:25
gpanders joined23:26
gpanders_ left23:28
Behold left23:28
j416 left23:28
j416 joined23:28
Behold joined23:29
Celelibi left23:29
kerframil joined23:30
GreyXor joined23:34
shored left23:36
Celelibi joined23:36
shored joined23:36
mikecmpbll joined23:37
fatalhalt left23:37
hussam left23:38
kapil_ left23:39
Celelibi left23:39
giaco joined23:40
royal_screwup21 left23:41
greatgatsby joined23:43
greatgatsby left23:44
Goplat joined23:44
greatgatsby joined23:44
m0viefreak left23:44
akem__ joined23:45
akemhp_ left23:47
fphilipe_ joined23:48
fatalhalt joined23:49
akemhp_ joined23:51
fphilipe_ left23:53
akem__ left23:53
LearnAllTheTime joined23:54
Narrat left23:55
libertyprime joined23:56
Celelibi joined23:57

Logs Search ←Prev date Next date→ Channels Documentation