repo.or.cz
/
git
/
gitweb.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
anti
B
éjar
pull: s
u
pp
o
r
t
r
e
based u
p
stream + fetch + pull --rebas
e
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-07-19
Santi Béjar
t55
2
0-pull: Test for reba
s
ed upstream + fetch +
pull
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi
Béjar
parse-remo
t
e: remo
v
e
unused
f
unct
i
ons
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi B
é
jar
parse-
r
emo
t
e: sup
p
ort de
f
a
u
lt reflist
in get_remote_
m
erge_branch
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi Béjar
par
s
e-remo
t
e
:
f
u
nction to get the t
r
acki
n
g branch to
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-08
San
t
i
Béjar
Do
c
umentation: I
n
troduce "upst
r
eam branc
h
"
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-06
Santi B
é
jar
D
o
cumentati
o
n: b
r
anch
.
*
.
mer
g
e
c
an
also affect 'git
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
Sant
i
Béjar
Documentatio
n
: pu
s
h
.
default app
l
ies
to all remo
t
es
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Document
a
tion
:
e
n
hance branch
.
<name>
.
{remote,merge
}
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-02-09
Santi Béja
r
d
o
c/bundle:
U
s
e t
h
e m
o
re conventional
suffix '
.
bundle'
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-21
S
a
n
ti Béjar
tu
t
orial-2: Update with
t
he new "git c
o
mmit" oupu
t
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-20
Santi Béjar
commit: more compac
t
sum
m
ary and
w
it
h
out extra quotes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-11-12
S
a
nti Béjar
r
e
v-
l
is
t
docu
m
e
n
t
ation: clarify the tw
o
parts of his
t
ory
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-05-06
Santi Béjar
comm
i
t: Show committer if
automatic
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
Santi
Béjar
c
o
mmit: Show
a
ut
h
o
r
if different from committer
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
S
a
nt
i
B
é
j
a
r
Preparati
o
n to call determi
n
e_
a
uthor_info
from
prepa
r
e
_
t
o_com
m
it
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Bé
j
a
r
ide
n
t
.
c:
r
ewo
r
d error message
wh
e
n the user name cannot
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-01
Sant
i
B
é
j
a
r
clo
n
e: s
u
ppor
t
clo
n
i
n
g full b
u
ndles
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Santi Béjar
git-d
e
scri
b
e
:
-
-long
sh
o
ws t
h
e o
b
j
ect name
e
ven for
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-25
Santi Béjar
g
it
-
bundle
.
t
x
t: Add d
i
fferent strategies to
creat
e
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-20
Santi Béjar
gi
t
-fetch: Fix s
i
n
gle_force in append_fet
c
h_h
e
ad
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
Santi
B
é
jar
gi
t
-
m
e
r
ge: finish
when git-r
e
ad-tree f
a
ils
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-05
Santi
B
é
j
ar
t/
t
5515-fetch-m
e
rge-l
o
gic
.
s
h
: Added t
e
sts for the merge
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-02-24
Santi Béja
r
core
.
legacyhea
d
ers
:
U
s
e th
e
description used in RelN
o
tes
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-30
Santi Béja
r
g
i
t-fetch: Allow f
e
t
ching the remote HEAD
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-17
Santi Béjar
tutori
a
l:
U
s
e onl
y
separate layout
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Santi Béjar
git-tag: ad
d
flag to v
e
rify a
tag
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
San
t
i Béjar
Documentati
o
n/tutorial: misc updates
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-23
Santi Béjar
Docume
n
tation for the [rem
o
te] config
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-01
S
anti Béjar
me
r
ge an
d
resolve: Output
s
hort has
h
es and
.
.
i
n "Updating
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-30
Santi Béjar
f
e
t
c
h: Res
e
t
remote
r
efs list each time fetch_m
a
in
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
S
an
t
i Béjar
Add test for the
def
a
ult m
e
rge
s
in fetch
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béjar
fetch: g
e
t the
r
emote b
r
a
n
ches
t
o mer
g
e
f
rom the b
r
a
n
ch
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béj
a
r
Fetch: default r
e
mo
t
e
repo
s
itory from branch pro
p
erti
e
s
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-24
Santi Béjar
Defaulting fetch to
o
r
igin whe
n
s
e
t in the repo-
c
o
n
fig
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