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
pull: support rebased upstream + fetch + pull --rebase
2009-07-19
S
a
nti
Béjar
pull:
sup
p
ort rebased upstrea
m
+
fetch
+ p
u
ll
-
-
reba
s
e
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-07-19
S
anti Béj
a
r
t
5
5
2
0
-pull: Tes
t
fo
r
rebase
d
upstream
+ f
e
tch +
p
u
ll
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi Béjar
parse-remote: remove
u
nuse
d
function
s
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
S
a
nti B
é
jar
pars
e
-
r
e
m
ote: supp
o
rt default reflist
i
n
get_
r
emote
_
merge_
b
ra
n
ch
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi Béjar
pars
e
-remote: functio
n
t
o
get the tracking branch to
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-08
Santi Béjar
Documentation
:
Introduce
"
upstream branch"
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-06
S
a
nti Bé
j
ar
Documenta
t
i
o
n: br
a
nch
.
*
.
merge can
also
a
ffect 'git
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béj
a
r
Document
a
t
i
on: push
.
de
f
a
u
lt ap
p
lies to all rem
o
tes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
D
ocumentation:
enhance branch
.
<na
m
e>
.
{remo
t
e,merge}
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-02-09
S
a
n
t
i
Béjar
doc/bu
n
dle: Use the mo
r
e
c
on
v
entional
s
uffix '
.
bundle'
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-21
S
a
n
ti Béjar
tutoria
l
-2: Updat
e
with th
e
n
ew "gi
t
c
o
m
mit" ouput
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-20
Santi Béjar
c
ommit: more
c
ompact summ
a
ry and without extr
a
qu
o
tes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-11-12
Sa
n
ti
Béjar
rev-l
i
s
t
docum
e
ntation: clarify the
t
wo parts
of history
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-05-06
Sa
n
t
i Béjar
c
ommit: Show c
o
mmitte
r
if automatic
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
Santi B
é
j
a
r
commit:
Show
author if
d
ifferent
f
r
om committer
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
S
a
nti Béjar
Preparati
o
n t
o
call
determ
i
ne_author_info f
r
om prepar
e
_to_commit
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-09
S
anti Béj
a
r
ide
n
t
.
c:
r
eword error message whe
n
the user name cannot
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-01
Sant
i
B
é
jar
c
l
one: support cloning full
b
undles
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Santi Béjar
git-descr
i
be: --lon
g
shows the ob
j
ect name
even
f
or
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-25
Sant
i
Béjar
git-bundl
e
.
txt: Add different strategies to crea
t
e
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-20
Santi Béjar
gi
t
-fet
c
h: Fix
s
ingle_force
in append_fetch_
h
e
a
d
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
Santi Béjar
git-mer
g
e: finish when
g
it-read-tree fails
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-05
Sa
n
ti
B
é
j
a
r
t/t5
5
15-fetch-merge-
l
o
gic
.
sh: Added t
e
s
ts fo
r
the
m
e
rg
e
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-02-24
Santi Béjar
c
ore
.
legacyheaders: Use the de
s
cripti
o
n used in RelNotes
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-30
S
an
t
i Béjar
git-fetch:
A
llow fetchi
n
g
t
he remote HEAD
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-17
Santi Béjar
t
utorial: Use only sep
a
rate layout
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Sa
n
ti Béjar
g
it-tag: add flag
t
o ver
i
f
y
a
tag
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Santi
Béjar
Documentation/tut
o
rial: misc upd
a
tes
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-23
Sant
i
Béjar
D
o
cumentation for
the
[
rem
o
te] config
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-01
Santi Béjar
merge
a
nd
resolve: Output short h
a
shes and
.
.
in "Updating
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-30
Santi
Béjar
fetch: Reset remote r
e
fs list ea
c
h time fe
t
ch_m
a
i
n
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béjar
Add test
f
or the default merges in fetch
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Sa
n
ti Béjar
fetc
h
: ge
t
the rem
o
te
b
ranc
h
es to
m
erge from the branch
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béja
r
Fetch: default rem
o
te
r
e
p
ositor
y
from branch properties
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-24
S
a
nti Béjar
Defaulting f
e
t
ch
t
o origin when set
i
n the r
e
po-config
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-04
Santi Béjar
Teach rev-parse th
e
.
.
.
syntax
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree