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
Merge branch 'maint-1.6.3' into maint
2009-07-19
Santi B
é
jar
pull: su
p
port r
e
b
ased ups
t
ream + fetc
h
+
pull --re
b
ase
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-07-19
Santi Bé
j
ar
t
5
520-pull: Test for rebas
e
d u
p
s
tre
a
m
+ fetc
h
+
pull
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi
Béjar
parse-rem
o
te:
r
emov
e
unus
e
d functions
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi
Bé
j
ar
p
arse
-
r
emote: support de
f
ault ref
l
ist
i
n
get
_
remote_m
e
rg
e
_
branch
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
S
ant
i
Béjar
parse-remote:
f
unction t
o
get th
e
t
rack
i
ng br
a
nch
to
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-08
Santi Bé
j
a
r
Do
c
u
menta
t
ion: Intr
o
d
u
ce "upstream branch"
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
Documentation:
b
r
anch
.
*
.
me
r
ge can also a
f
f
e
ct 'git
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
S
anti Béj
a
r
Documenta
t
ion:
push
.
default appl
i
es to all remotes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béj
a
r
Documentat
i
o
n: enhanc
e
branch
.
<name
>
.
{remote,
m
erge}
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-02-09
Santi Béjar
doc/bundle
:
Use the more conventional
suf
f
ix '
.
bundle'
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-21
Santi Béjar
tutori
a
l
-
2
: Update with t
h
e new "
g
it
c
o
mmit" ouput
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-20
S
anti
B
éjar
c
o
mmit
:
m
o
r
e
compact
s
u
m
mary
a
n
d
without extra quotes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-11-12
S
a
nti Béj
a
r
r
e
v
-list documentatio
n
:
c
l
arify
t
he
two
p
arts of histor
y
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-05-06
S
anti Béjar
commi
t
: Sh
o
w committer
i
f
automat
i
c
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
Santi Béjar
commit:
S
ho
w
author i
f
d
i
ffere
n
t from committer
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
Santi B
é
ja
r
Pre
p
aration to
c
all
de
t
erm
i
n
e
_author
_
info fr
o
m prepare_t
o
_commit
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-09
S
anti Béja
r
id
e
n
t
.
c: reword error messag
e
when the user name
c
annot
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-01
Santi
Béjar
clone: suppor
t
cloning full bund
l
e
s
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
S
a
nti Béjar
git-describe: --long shows
t
he object nam
e
even for
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-25
Santi Béja
r
git-
b
undle
.
txt: Add dif
f
eren
t
st
r
ategies to cre
a
te
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-20
Santi B
é
jar
git-f
e
tch: Fi
x
s
i
ngle
_
force
i
n append_fetch_head
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
Santi Béjar
g
i
t-merge: finis
h
when git-
r
ea
d
-tree f
a
i
ls
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-05
Santi Bé
j
a
r
t/t5515-fetch-merge-
l
ogic
.
s
h
: Ad
d
ed t
e
sts for
the merg
e
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-02-24
Santi Béjar
c
o
re
.
legacy
h
eade
r
s:
Use the description used
in RelNotes
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-30
Santi Béjar
git-
f
e
tch: Allow fet
c
hing the remote
H
EAD
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-17
Santi
B
éjar
tutorial: Use on
l
y separa
t
e layout
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Santi Béjar
git-tag: add
flag to
verif
y
a tag
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
S
anti Bé
j
a
r
D
o
cument
a
tion/tutorial: misc
u
pdates
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-23
Santi
B
éjar
Doc
u
men
t
ation for t
h
e [
r
emote
]
config
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-01
Santi
B
éjar
merge and r
e
s
o
l
ve:
Out
p
ut short hashes and
.
.
in "U
p
dating
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-30
S
anti Béjar
fetch: Rese
t
remo
t
e re
f
s list each time fetch_main
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi
Bé
j
ar
Add te
s
t f
o
r the
d
e
fault me
r
ges
i
n fetch
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béjar
fetch:
g
e
t
the re
m
o
t
e
branches t
o
me
r
ge from the branch
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béjar
Fetch: default remote r
e
pository from bra
n
ch
p
roperties
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-24
Sa
n
ti Béjar
Defaulting fetch
t
o
o
rigi
n
when set in t
h
e repo
-
co
n
fig
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-04
Sant
i
B
éjar
Teach r
e
v-parse the
.
.
.
syntax
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree