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/mergetool-prompt'
2014-05-20
Felipe Contreras
co
n
trib: remote-helper
s
:
a
dd
m
ove
w
arnings (v2
.
0)
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-05-13
Felipe Contreras
contr
i
b: completio
n
: fix 'er
e
ad()' namespace
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-22
Felipe Contreras
merge: enable d
e
fau
l
t
t
o
u
pstream by de
f
aul
t
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-22
Fel
i
pe Contreras
mergeto
o
l: run prom
p
t only i
f
gu
e
ssed tool
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-22
Fel
i
pe Contrera
s
mergetools: a
d
d vimdiff3 mode
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-21
Feli
p
e
C
o
ntrer
a
s
t58
0
1 (remo
t
e
-
helpers): c
l
eanup
e
n
vir
o
nment sets
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
F
e
lipe Contreras
transport-helper: fix sy
n
c issue on
c
rashes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
F
elipe Cont
r
e
r
as
tra
n
sport-hel
p
e
r
:
t
rivial cl
e
anup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe C
o
ntrer
a
s
t
ransport-h
e
lper: propag
a
t
e recvline() error
pus
h
ing
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe Contreras
remote-he
l
per
s
: make recvline ret
u
rn an error
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe
Co
n
treras
transport-helper:
r
emove barely used x
c
hgline()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe Cont
r
eras
prompt: fix miss
i
ng fi
l
e errors i
n
zsh
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Fel
i
pe Contreras
remo
t
e-bzr: tr
i
vial test fi
x
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
F
elipe Contre
r
as
completion:
f
ix comple
t
ing args of aliased
"p
u
sh"
,
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
Felipe
Contreras
remote-b
z
r: add su
p
port for older v
e
rsions
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
Felipe Contreras
remote-hg:
a
lwa
y
s norm
a
lize pat
h
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
F
elipe Co
n
treras
remote-helpers: a
l
l
o
w
all tests running from any dir
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Co
n
treras
r
e
mote: fix status with branch
.
.
.
rebase=prese
r
ve
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe
Contreras
f
etch: add missing d
o
cumentation
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Contreras
t: trivial
w
h
itespace cleanups
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
F
e
lipe Contreras
abspath: trivial style f
i
x
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
F
elipe C
o
ntreras
re
m
ote-hg:
add te
s
t
s
fo
r
s
p
ecial fi
l
enames
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Contreras
remote-hg:
f
i
x
'shared path' path
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe
C
ontreras
remote-helpe
r
s: ad
d
extra safe
t
y
checks
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-18
Felipe Co
n
treras
t
e
s
t
-bz
r
.
sh, test-hg
.
sh: allow running fr
o
m any di
r
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-18
Felipe Cont
r
e
r
as
test-lib
.
sh: conve
r
t $TEST
_
DIRECTORY t
o
an abso
l
ute
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-12
Felipe
C
ontr
e
ras
transport-he
l
per:
c
he
c
k for 'forced update' messa
g
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-12
Feli
p
e Co
n
treras
tra
n
sport-helper: add 'forc
e
' to
'
export' helpers
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Co
n
treras
setup
:
tr
i
vial style fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Fe
l
i
p
e Con
t
reras
run-co
m
mand: trivial style fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Fel
i
pe C
o
ntreras
diff: tr
i
v
ial style
fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contre
r
as
revision: trivial s
t
yle fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felip
e
Cont
r
eras
pretty: trivial style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
F
e
lip
e
C
ontreras
des
c
ribe: trivial
s
tyle fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contreras
t
ranspo
r
t-helper:
t
r
i
vial style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Feli
p
e
C
ont
r
eras
s
h
a1-name: trivial style cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contreras
branch: trivial s
t
y
l
e fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felip
e
Contre
r
as
revision: add
m
i
s
sing includ
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contreras
transport-helper
:
don't up
d
a
te refs in dry
-
run
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felip
e
C
ontr
e
ras
transport-helper: mismerge fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Feli
p
e Con
t
r
e
r
a
s
t
:
repl
a
c
e
pulls with merges
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Fel
i
pe C
o
ntreras
merge
:
simplif
y
ff-only option
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-16
Feli
p
e Cont
r
eras
a
l
ias:
h
ave
SP around
a
rithmetic operators
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-12
Felipe Contreras
Add new @ shortcut for HEAD
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Co
n
treras
rev-parse
tes
t
: use st
a
nd
a
rd test fu
n
ctions
for
s
etup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contreras
re
v
-parse test:
use test_must_fail
,
not "
i
f <comma
n
d
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contreras
rev-pa
r
se test:
moder
n
ize quoting and wh
i
tes
p
ace
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe
C
o
ntreras
fast-export:
r
efactor get_tags_and_duplicates()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Co
n
treras
fast-e
x
port: ma
k
e
extra_refs global
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contreras
t
:
branch: fi
x
broken && chains
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Fe
l
i
pe
C
ontreras
t: branch
:
fix t
y
po
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Con
t
re
r
as
t: branch: tri
v
ial style
fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contreras
sha
1
-nam
e
: pa
s
s len argum
e
nt t
o
inte
r
pret_branch
_
name
(
)
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
F
e
lip
e
Contreras
add:
trivial sty
l
e cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
Felipe Cont
r
eras
r
eset:
t
riv
i
al
s
ty
l
e
c
leanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
Felipe Contrer
a
s
branch: trivial style fi
x
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
Fel
i
pe Contreras
reset: trivial refactor
i
n
g
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-30
Felipe Contrer
a
s
re
m
ote-hg
:
use notes to k
e
ep
tr
a
ck of
H
g revisio
n
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contreras
r
e
mote
-
hel
p
er
s
:
clean
u
p more glob
a
l
v
ariables
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contreras
remot
e
-
h
elper
s
: trivial sty
l
e
f
ixe
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe C
o
ntreras
remot
e
-hg: impr
o
ve ba
s
ic test
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contr
e
ras
remote-hg: add mi
s
sing &&s in the te
s
t
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Cont
r
era
s
remote-hg: fix test
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contrer
a
s
remote-bzr: make bzr bra
n
c
hes configurab
l
e per-
r
ep
o
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Fe
l
ipe Contreras
r
em
o
te
-
bzr: f
i
x
e
xport of utf-8 author
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-13
F
e
lipe Co
n
t
r
eras
unp
a
c
k-tree
s
: plug a m
e
mory leak
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-12
Felipe Contreras
remo
t
e
-hg: add shared repo upgrade
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-12
Fe
l
ipe Contreras
rem
o
te-hg: en
s
ure shared re
p
o is initialize
d
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-09
Fe
l
ipe
C
ontrera
s
M
a
k
e
f
i
le
:
us
e
$^ to a
v
oi
d
listing prer
e
quisit
e
s on
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-07
F
elipe Cont
r
eras
build: d
o
no
t
install git-remote-testgit
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-07
Felipe
C
ontreras
build
:
gen
e
rate and clean
t
e
s
t sc
r
ipts
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-06
Felipe Contreras
sequencer: avoi
d
leaking me
s
sage
buff
e
r when re
f
u
s
i
n
g
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Felipe Contreras
sequenc
e
r: remove useless indentation
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Felipe Contreras
s
h
a
1
_file:
trivi
a
l style clean
u
p
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Felipe Contreras
read-ca
c
he: trivial style cleanups
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Felipe Co
n
treras
read-cache: fix
wrong 'th
e
_index' u
s
ag
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
F
e
lipe
C
o
n
treras
test: fix post rewri
t
e hoo
k
report
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-02
Felipe Contreras
completion: avoid ls
-
rem
o
te in
certain scenarios
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-29
Fe
l
ipe Contre
r
as
completion: zsh:
i
mprove bash
script l
o
a
ding
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-29
Felipe C
o
ntreras
prompt: fix fo
r
s
im
p
le r
e
base
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felip
e
C
o
ntreras
send-email: remove wa
r
ning abou
t
unset c
h
ai
n
replyto
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
te
s
t
:
rebase: fix
-
-
i
nteractive test
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
F
e
l
i
p
e
C
ontreras
test
:
trivial
cleanups
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Feli
p
e
Contre
r
as
remot
e
: trivia
l
s
tyle cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Co
n
treras
remote-hg:
add support fo
r
--fo
r
ce
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe C
o
ntreras
r
e
mote-h
g
:
a
dd support for --dr
y
-run
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Con
t
reras
r
e
mote-hg: ch
e
c
k if a
fet
c
h is nee
d
ed
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felip
e
Co
n
treras
re
m
o
te-hg: tr
i
via
l
cl
e
anup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Feli
p
e Contre
r
as
r
e
m
o
te-helpers: im
p
rove marks usa
g
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Fel
i
pe Con
t
reras
r
e
m
ote
-
h
g: add check_pus
h
() he
l
per
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
remote-hg: add setup_big_push() helper
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Cont
r
eras
remote-hg
:
rem
o
ve
f
il
e
s
bef
o
re modi
f
i
c
ations
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
F
e
l
i
p
e
Contreras
remote-h
g
: improve lightweight tag aut
h
o
r
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
F
e
lipe Cont
r
eras
remote-
h
g: use remote
'default'
n
ot local one
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
F
e
lipe
Contreras
remot
e
-hg: im
p
rove branch lis
t
ing
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
F
elipe C
o
nt
r
e
r
as
r
emote
-
hg: sim
p
l
i
fy br
a
nch_tip()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Feli
p
e Contre
r
as
remote-hg: check diverged bookmarks
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
F
e
lipe Contreras
re
m
o
te-hg
:
pass around revision
r
efs
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe C
o
ntrera
s
rem
o
t
e-hg: implem
e
nt custom che
c
kheads()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe
Contreras
remote-hg:
i
mplement custom push()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
next