repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bc/maint-am-email' into maint
2009-07-19
Santi Béjar
p
u
ll: s
u
p
p
ort rebased upstream +
fetch
+
pull --r
e
base
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-07-19
Santi Béjar
t
5520-pul
l
:
Test f
o
r rebased
u
pstrea
m
+ f
e
tch
+ pull
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi Béj
a
r
pa
r
se
-
remote: remov
e
u
nused f
u
ncti
o
n
s
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi Béjar
p
arse-remote: s
u
pport default r
e
flist in get_rem
o
t
e_merge_branch
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi Béjar
p
ars
e
-
r
em
o
t
e: function to
get the tra
c
king bran
c
h to
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-08
Sant
i
B
éjar
Documentation: In
t
roduce
"
upstream branch"
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-06
Santi B
é
jar
Documentation: branch
.
*
.
merge can also affect 'g
i
t
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
S
a
nti Béjar
Documentation: push
.
def
a
ult appl
i
e
s
to
all
remotes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
Sa
n
ti Béja
r
D
ocumentation: en
h
anc
e
branch
.
<name>
.
{remo
t
e,merge}
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-02-09
Santi Béjar
d
o
c/b
u
n
d
le: Use the m
o
re
conventi
o
nal
suffix '
.
bundle'
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-21
Santi Béjar
tuto
r
ial-2:
Updat
e
w
ith the new "g
i
t commit" oupu
t
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-20
Sant
i
Béjar
commit:
more c
o
mpact summary
and without ex
t
ra
q
u
o
tes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-11-12
Santi Béjar
rev-list doc
u
mentation: cl
a
r
i
f
y the tw
o
parts
o
f
history
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-05-06
Santi Béjar
c
ommit: Show com
m
i
t
ter if automatic
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
Santi Béjar
co
m
mit: Show author if different f
r
om com
m
itte
r
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
Santi Béjar
Preparation
t
o
call d
e
termine_author_info from pre
p
a
r
e
_
t
o
_co
m
mi
t
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi
B
é
jar
iden
t
.
c: rew
o
rd
error mess
a
ge when the use
r
name cannot
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-01
Santi Béjar
clon
e
: support clo
n
in
g
full bundl
e
s
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
San
t
i Béjar
gi
t
-describe
:
--long shows the object name ev
e
n for
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-25
Sant
i
Béjar
git-bund
l
e
.
txt: Add
d
i
f
f
erent strategies to cre
a
te
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-20
Santi Béjar
git-fetch: Fix
s
ing
l
e
_
force in
append_fetch_head
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
Santi
Bé
j
ar
git-merge:
finish when gi
t
-r
e
ad-t
r
ee fails
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-05
S
anti B
é
jar
t/
t
5
5
15-fetch-merge-logic
.
sh: Added t
e
sts f
o
r t
h
e merge
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-02-24
Sant
i
Béj
a
r
cor
e
.
l
egac
y
head
e
rs: Use the descriptio
n
used in RelNotes
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-30
Santi Béjar
git-fetch: Allow fetching
the remo
t
e HEAD
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-17
S
a
nti Béjar
t
u
t
orial: Use onl
y
se
p
arate layout
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Sa
n
ti B
é
jar
git-tag: add flag to verify a tag
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Sant
i
Béjar
Documentation/tutorial: misc updates
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-23
Santi Bé
j
ar
Documentation 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 an
d
re
s
olve: Output sho
r
t hashes and
.
.
in "Updating
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-30
Sa
n
ti Béjar
fetch: Reset re
m
ote refs list each tim
e
f
etch_mai
n
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béjar
Ad
d
test for the de
f
ault
m
e
rges i
n
f
e
tc
h
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béjar
fetch: get the rem
o
te branc
h
es to mer
g
e f
r
om the bra
n
ch
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi
Béjar
Fetch: default re
m
ote repository from
b
r
anch p
r
ope
r
ties
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-24
Santi Béjar
Defaulting f
e
t
ch
to o
r
igin when se
t
in the repo-conf
i
g
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-04
Santi Béjar
Teach r
e
v-parse th
e
.
.
.
sy
n
tax
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree