repo.or.cz
/
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 'fc/rerere-conflict-style' into maint
2014-05-20
Felipe Contreras
contri
b
: remot
e
-helpers:
a
dd
m
ove warnings (v2
.
0
)
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-05-13
Feli
p
e Contreras
contrib: co
m
pletion
:
f
i
x 'eread()' namespace
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-30
Felipe Contre
r
as
r
e
re
r
e: fix for mer
g
e
.
conflictstyle
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-21
Felipe Contreras
t5801 (remote-helpe
r
s): cleanup e
n
vironment s
e
ts
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
F
e
l
ipe Contrer
a
s
tr
a
n
s
port-h
e
lp
e
r:
fix sync is
s
u
e
on c
r
a
s
hes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe Cont
r
eras
tra
n
s
p
o
r
t-helper
:
trivial cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe Contreras
transport-helper: propagate re
c
v
l
ine() error pushing
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe
C
o
n
t
reras
remote-helpe
r
s
: make recvline return an error
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Fel
i
pe
Contreras
tr
a
nsport-helper: remo
v
e barely used
x
chgline()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe Contrer
a
s
prompt: fix missing
file errors in zsh
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Fe
l
i
p
e Contreras
remote
-
bzr
:
t
r
ivial
test fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
Fe
l
ipe Contreras
c
om
p
letion: fix completing args
of aliase
d
"p
u
s
h
",
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
F
elipe Con
t
r
eras
remote-b
z
r:
add sup
p
ort for old
e
r
v
ersions
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
Felipe Contreras
remote-hg:
a
l
ways normalize paths
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
Felipe Contreras
remote-
h
elpers:
allow all tests runnin
g
fro
m
any dir
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Contre
r
as
remote: fi
x
stat
u
s with
branch
.
.
.
rebase=p
r
e
s
erve
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Contreras
fetch: add missing do
c
umentatio
n
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe
Contr
e
ras
t: triv
i
al whitespace cleanups
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Fe
l
i
p
e Contreras
a
b
spath: trivial style
f
ix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Cont
r
e
r
as
remote-hg: add tests for special f
i
lenames
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Contreras
remote-hg: fix 'sh
a
red
path' path
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Feli
p
e Con
t
r
e
ras
remote-
h
elpers: add
e
xtra safety
c
hecks
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-18
Felipe Contrer
a
s
test-bzr
.
sh, test-
h
g
.
sh: al
l
o
w runni
n
g from any dir
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-18
Fe
l
ipe Contreras
test-li
b
.
sh: conv
e
r
t
$TEST_DI
R
ECTORY to an abs
o
lute
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-12
Felipe Con
t
reras
transport-he
l
p
er: check for 'forced upda
t
e'
message
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-12
Feli
p
e Contr
e
ras
transport-h
e
lper: add '
f
orce' to 'ex
p
ort' helpers
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contreras
set
u
p: trivial
s
tyle fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Con
t
rer
a
s
run-co
m
m
and: t
r
ivial styl
e
fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe C
o
ntreras
diff: trivial style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
F
e
l
ipe C
o
n
t
r
eras
revision: trivial s
t
yl
e
fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contr
e
r
a
s
p
retty:
t
ri
v
ial
style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe
C
o
ntrera
s
describe
:
t
r
i
vial styl
e
f
i
xes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Feli
p
e Contrer
a
s
transport-helper: trivial style
fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Co
n
t
r
eras
sh
a
1
-name: tri
v
i
a
l style cl
e
anu
p
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contreras
bra
n
ch: trivial
style fi
x
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Fel
i
pe Contreras
revision: add miss
i
ng include
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe
Contreras
transport-helper: don't update r
e
fs in dry-run
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Cont
r
eras
transport-helper: mi
s
merge fi
x
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
F
elipe Contrera
s
t: r
e
pl
a
c
e pul
l
s with mer
g
e
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Fel
i
pe
Contr
e
ras
m
erge: simplify ff-only o
p
tion
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-16
Felip
e
Contre
r
as
al
i
as
:
have SP around arithmetic operators
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-12
Felipe Contreras
Add new @
s
hortcut
f
or
HEA
D
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe
Contreras
rev-parse test
:
use s
t
and
a
rd test fun
c
tions
for setu
p
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
F
e
l
i
p
e
Contreras
re
v
-parse test: use test_must_fail, not "if
<
comman
d
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
F
e
lipe Contreras
rev
-
parse t
e
st
:
moder
n
ize
q
uotin
g
an
d
whitespace
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
F
e
lipe Contr
e
ras
f
a
st-expor
t
: ref
a
ctor get_tags_and_d
u
plicate
s
()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Cont
r
e
r
as
fa
s
t
-
e
xport: make extra_refs g
l
o
b
al
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe
C
o
nt
r
e
r
as
t: branch: fix broken &
&
chai
n
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contreras
t: branch: fix typo
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contreras
t: b
r
anch: trivia
l
style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contreras
s
ha
1
-n
a
m
e:
pa
s
s len argumen
t
to int
e
r
pret_br
a
n
c
h_name()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
F
eli
p
e
C
ontreras
add: trivial style cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
F
el
i
pe Contreras
res
e
t: t
r
i
v
i
al
s
tyle cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
Felip
e
Con
t
r
e
ra
s
b
r
an
c
h:
t
rivial
s
t
y
le fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
F
e
lipe C
o
nt
r
e
r
as
reset: trivi
a
l
r
efactoring
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-30
Felipe
C
ontreras
remote-hg: use notes to ke
e
p
track of Hg revision
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contr
e
ras
r
emote-helpers: cleanup more gl
o
bal
va
r
iables
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contreras
remote-h
e
lper
s
: trivia
l
st
y
le
f
ixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
F
elipe Contreras
remote-
h
g: improve
b
as
i
c test
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
F
elip
e
Contrer
a
s
remote-hg: add
m
i
ss
i
ng &&
s
i
n
the
test
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contreras
remot
e
-hg: fix
t
est
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felip
e
C
o
ntrer
a
s
remote-bzr: ma
k
e bzr branches configurable p
e
r-
r
e
po
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contreras
remote-
b
zr: fix export of utf
-
8 a
u
thors
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-13
Felipe Contreras
unp
a
ck-tree
s
:
p
lug
a memory lea
k
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-12
F
elipe Cont
r
eras
remote
-
hg: add
s
ha
r
e
d
repo up
g
rade
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-12
F
e
lipe Contre
r
as
remot
e
-hg: ensure
shared
repo is initialized
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-09
Felipe Contre
r
as
Ma
k
efi
l
e: use $^
to avoid listi
n
g
p
rerequisites on
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-07
Felipe Contreras
b
u
ild: do
not
i
n
stall g
i
t
-remote-testgit
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-07
Felipe
C
ontr
e
r
as
build
:
generate an
d
clean test
s
cripts
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-06
Fe
l
ipe C
o
ntreras
sequence
r
:
a
void leaking message buffer when refusing
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Felipe Contreras
sequenc
e
r: re
m
o
ve
u
s
eless indent
a
tion
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
F
elipe Contreras
sha1_file
:
trivial style
c
lea
n
up
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Felipe
C
on
t
r
e
ras
r
e
a
d
-
cach
e
: triv
i
al style cleanups
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Felipe C
o
ntreras
read-cache: f
i
x wrong 'the_ind
e
x' usage
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Fel
i
pe Con
t
rer
a
s
test: fix
p
ost
r
ewrite
hook report
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-02
Fel
i
p
e
Co
n
t
reras
c
o
mpletion:
a
voi
d
ls-re
m
o
t
e i
n
certain sc
e
narios
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-29
Feli
p
e Co
n
treras
complet
i
on: zsh: i
m
prov
e
bash
script loading
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-29
Felipe Contre
r
as
promp
t
:
f
i
x
for simple rebase
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contr
e
ras
s
e
nd-email: r
e
move warning about unset
c
hainr
e
plyto
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe C
o
ntreras
t
e
s
t
: rebase: fix
-
-interactive test
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Fel
i
pe Co
n
treras
t
est: trivi
a
l cleanu
p
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe
C
ontreras
rem
o
te: triv
i
al
s
tyle cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Fe
l
i
pe Contreras
remote-hg: a
d
d s
u
pp
o
rt
f
o
r --force
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
remote-hg:
ad
d
s
uppo
r
t for --dry-run
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
r
emote-hg: check
i
f
a fetch is
needed
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
remote-hg: tri
v
i
al cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
rem
o
t
e
-helpe
r
s: i
m
p
r
ove marks usag
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe C
o
ntreras
r
e
mote-hg: add check_push() help
e
r
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
r
emote-hg: add
s
e
tup_big_pu
s
h() helper
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contrera
s
remote-
h
g:
r
emove files before
modif
i
cations
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Feli
p
e
Contreras
remote-hg: impro
v
e ligh
t
weight tag auth
o
r
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contre
r
as
remote-hg: use r
e
mo
t
e
'
default
'
no
t
loc
a
l o
n
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Co
n
t
reras
r
e
mo
t
e-
h
g: improve
b
ranch
listi
n
g
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Co
n
t
r
eras
re
m
o
t
e-hg: simplif
y
branch_t
i
p()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Cont
r
eras
re
m
ote-
h
g
: c
h
eck div
e
rged b
o
okmarks
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contrer
a
s
remote-hg
:
p
as
s
around revision refs
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contre
r
as
remote-
h
g: implemen
t
c
u
s
tom ch
e
ckhe
a
ds()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
remote-hg: im
p
l
e
ment custom p
u
sh()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
F
elip
e
Contre
r
as
remote-hg: only upda
t
e necessary revision
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contrer
a
s
remote-hg: force r
e
mo
t
e bo
o
k
m
ark push s
e
lectively
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
next