repo.or.cz
/
alt-git.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
S
a
n
t
i
Béjar
pull: support reba
s
ed
u
pstream + fet
c
h
+
pul
l
-
-
rebase
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-07-19
San
t
i Béjar
t5520
-
pull: Test for r
e
based upst
r
eam + fe
t
ch + pu
l
l
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi Béja
r
parse-remote: re
m
o
ve
u
nused functions
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi Béjar
parse-remote:
s
upport defau
l
t refl
i
st in get_remote_merge_bra
n
ch
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
San
t
i Béjar
parse-remote: fun
c
tion to get the tracking branch to
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-08
San
t
i Béja
r
Do
c
umentat
i
o
n: I
n
t
r
o
duce "upstream br
a
nch"
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-06
S
a
nti
B
éj
a
r
Documen
t
ati
o
n: branch
.
*
.
me
r
ge ca
n
also affect
'
g
it
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
S
a
nti Béj
a
r
Docum
e
ntation: push
.
de
f
ault ap
p
l
ies t
o
a
ll
r
em
o
tes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
Sant
i
Béjar
Documentation: enhance
branch
.
<
name>
.
{
remot
e
,
m
e
r
ge}
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 '
.
bun
d
le'
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-21
S
anti B
é
jar
tuto
r
ial-2:
Upda
t
e with the new "git commit
"
o
uput
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-20
Santi Béjar
commit: more
c
o
m
pact su
m
mary and without extr
a
quotes
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-11-12
Santi Béjar
r
e
v-list d
o
c
u
ment
a
tio
n
:
c
larify t
h
e two p
a
rts of history
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-05-06
S
a
nti Béjar
co
m
mit
:
S
ho
w
com
m
itter i
f
automatic
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
San
t
i
Béjar
commit
:
Sho
w
author if diffe
r
ent fro
m
com
m
itter
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
Santi Béjar
Preparation
t
o call
d
etermin
e
_aut
h
or_info from
p
rep
a
re_to_commit
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-09
S
a
n
ti Béj
a
r
i
d
en
t
.
c: reword error message when
the user
name cannot
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-01
S
a
nti Béjar
clone: support cl
o
n
ing
f
ull
bundles
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Santi Béj
a
r
g
i
t
-d
e
sc
r
ibe: --long shows the object name e
v
en for
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-25
Santi Béjar
git-bundle
.
txt: Add
di
f
ferent stra
t
egies to create
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-20
Santi B
é
j
ar
git-fetch:
Fix single_forc
e
i
n append_
f
etch_head
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
Santi Béja
r
git-mer
g
e: finish when git-read-tr
e
e 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
1
5-fetch-merge-logic
.
sh: Added tests fo
r
the merge
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-02-24
Santi Béjar
core
.
legacyheaders: Use the descript
i
on use
d
i
n R
e
lNote
s
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-30
Santi
B
éjar
git-f
e
tch: Allow
f
etching the
r
emo
t
e HEAD
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-17
Santi Béjar
tuto
r
ial: Use on
l
y
s
e
parate layou
t
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
S
anti
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
Santi
Béj
a
r
Documentation/tutorial: misc updates
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-23
Santi Béjar
Docum
e
ntation
for th
e
[remote] config
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-01
Sant
i
B
é
jar
m
e
rge and r
e
solve: Output
s
hort ha
s
hes
a
nd
.
.
in "Updating
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-30
Santi
B
éjar
fetch
:
Reset remote
r
efs
l
is
t
each ti
m
e f
e
tch_
m
a
i
n
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
S
a
nti Béjar
Add test fo
r
the default merges
i
n f
e
tc
h
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Bé
j
ar
fetch: get
the r
e
mote br
a
n
c
hes
t
o
merge
f
r
om
t
he
branc
h
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi Béjar
Fet
c
h: default remote repository
f
rom branch p
r
o
p
erties
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-24
Sant
i
Béjar
Defa
u
lting fetch
t
o
o
r
igin when set in
th
e
re
p
o
-
config
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-04
S
anti Béjar
Teach
rev-parse th
e
.
.
.
syntax
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree