repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-20
Santi Béjar
git-fet
c
h: F
i
x si
n
gle_forc
e
in append_fetch_he
a
d
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
Santi
B
éj
a
r
git
-
m
e
rge: finish w
h
en
g
it-read-
t
ree
fails
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-05
Santi Béjar
t/t551
5
-fetch-merge-lo
g
i
c
.
sh:
A
dded
t
ests for the merge
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-02-24
Santi
Béjar
core
.
le
g
ac
y
header
s
:
U
se the desc
r
iption
u
s
ed in
RelN
o
tes
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-30
S
a
nti Béjar
git-fetc
h
:
Allow fetching the re
m
o
t
e HEAD
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-17
Santi Béjar
tutorial:
U
se only se
p
arat
e
la
y
out
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
S
a
nti Béjar
git-ta
g
: add flag
t
o ve
r
ify a tag
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
S
a
nti Béjar
D
ocumentation/tutorial: misc updates
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-23
Santi B
é
jar
Documentat
i
on f
o
r the [r
e
m
ote]
c
onfig
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-01
Santi Béjar
merge and resolve: Output short ha
s
hes and
.
.
in "Up
d
ating
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-30
Santi Béjar
fetch: Reset remote re
f
s lis
t
e
a
ch time f
e
tch_main
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béja
r
Add test for the default merges in f
e
t
ch
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
S
a
nti B
é
j
a
r
fetch: g
e
t
the r
e
mote br
a
nches
to merge f
r
om the branch
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
San
t
i Béjar
F
e
t
ch:
d
efault
r
emote
r
ep
o
sito
r
y
f
rom branch pr
o
pert
i
es
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-24
Santi Béjar
D
ef
a
ulting fe
t
ch to o
r
igin
w
hen set in the re
p
o-co
n
fig
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-04
Sant
i
Béjar
Tea
c
h rev-parse the
.
.
.
syn
t
a
x
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree