repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: consistent error messages for staged and unstaged changes.
2009-07-19
Santi
Béjar
pull: supp
o
r
t
reb
a
sed upstr
e
am + f
e
tch + pull --rebase
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-07-19
Santi
B
éjar
t55
2
0-pul
l
:
Test
for rebased u
p
s
tream + fetch
+ pull
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
San
t
i Béjar
pars
e
-r
e
mot
e
: remove
u
nu
s
ed functi
o
n
s
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
S
anti B
é
jar
pars
e
-
remote
:
support de
f
aul
t
reflist in get_remote_merge_branch
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-06-12
Santi B
é
jar
parse-remo
t
e: function to get the tracking b
r
anch to
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-08
Santi Béjar
Do
c
umen
t
ation: Introduce "ups
t
ream branch"
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
D
o
cumentatio
n
:
branch
.
*
.
m
e
rge 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
D
o
cumentation
:
push
.
de
f
ault a
p
plies to all remo
t
es
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Do
c
u
mentati
o
n:
e
nhance branch
.
<name>
.
{
remote,merge}
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-02-09
Santi Béjar
d
oc/bundle
:
Use the more
c
onventiona
l
suffix '
.
bun
d
le'
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-21
Sant
i
Béjar
tutorial-2: Upd
a
te
w
ith
the new "
g
it commit" ouput
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2009-01-20
Santi
B
éjar
commit: more compact s
u
m
m
ary and without
e
xtra
quote
s
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-11-12
Santi
Béj
a
r
rev
-
list do
c
umentation: cla
r
ify the two par
t
s
of histor
y
.
.
.
Signed-off-by:
Santi Béjar
<santi@agolina.net>
commit
|
commitdiff
|
tree
2008-05-06
Sant
i
B
é
j
ar
c
ommit: Sh
o
w committer if
automatic
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
San
t
i Béjar
commit: Show author
i
f different
from co
m
mitter
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-05-06
Santi Béjar
Prepar
a
tion
to cal
l
determi
n
e
_author_info from
prepare_to_commit
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Bé
j
ar
iden
t
.
c
:
reword er
r
or me
s
sage when the user
n
ame cannot
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-03-01
San
t
i Béj
a
r
clone: s
u
pport cloning full bundle
s
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-26
Santi Béjar
gi
t
-descri
b
e: --long sho
w
s
t
he obj
e
ct n
a
me ev
e
n for
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2008-02-25
Santi Béjar
git-bundle
.
txt: Add differ
e
nt st
r
a
tegies to create
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-20
S
a
nti B
é
ja
r
git-fetc
h
:
F
ix sing
l
e_force in
a
ppend_fetch
_
head
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
Santi
Béjar
git-merge: finish
when g
i
t-read-tre
e
fails
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-03-05
Sa
n
ti B
é
jar
t
/
t5
5
15
-
fetch-merge-logic
.
sh: Added t
e
s
ts
f
or the m
e
rge
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-02-24
Santi
B
é
jar
core
.
leg
a
cyh
e
aders: U
s
e the descripti
o
n
u
se
d
in
R
elNote
s
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-30
Santi Béjar
git-fe
t
c
h: Allo
w
f
e
tc
h
i
ng
t
he remote HEAD
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-17
Santi Béjar
tutorial
:
Use only sep
a
rate layout
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Santi Béj
a
r
git-ta
g
: add fl
a
g to verify
a
t
a
g
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Santi Béjar
Docum
e
nt
a
t
i
on/tutorial:
m
isc updates
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-23
San
t
i
B
é
j
ar
Documentati
o
n for the [r
e
mote
]
config
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-10-01
Santi Béjar
merge and
reso
l
ve: Output short ha
s
hes a
n
d
.
.
in
"
Upd
a
ting
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-30
San
t
i B
é
jar
fet
c
h
:
R
eset
remote refs list e
a
c
h
t
i
me fetch_main
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi
B
é
j
ar
A
d
d test
for th
e
d
e
f
a
ult
m
e
rges in fetc
h
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
Santi B
é
jar
fe
t
c
h
:
get the remote branch
e
s to m
e
r
ge from
t
he branc
h
.
.
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-09-24
S
a
nti Béjar
Fetc
h
: def
a
ult r
e
mote reposi
t
ory from branch properties
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-24
Santi Béjar
Defaul
t
ing f
e
tch to orig
i
n whe
n
set
in th
e
rep
o
-con
f
ig
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree
2006-07-04
Santi Béjar
T
e
ach rev-parse the
.
.
.
syntax
.
Signed-off-by:
Santi Béjar
<sbejar@gmail.com>
commit
|
commitdiff
|
tree