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 Con
t
reras
con
t
r
ib: remo
t
e-helpers: add move
w
arnings (v2
.
0)
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-05-13
Feli
p
e Contreras
contrib: comp
l
etion: fix 'eread()' name
s
pace
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-22
Felipe Contreras
merge: ena
b
l
e defaulttoupstream by default
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-22
F
e
lipe Contreras
mergetool: run promp
t
o
n
l
y if guessed
t
ool
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-22
Felipe Contreras
merg
e
tools: add vimdiff3 mode
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-21
Feli
p
e
C
o
n
t
reras
t
5
801 (remote-hel
p
ers):
c
l
eanup environment sets
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe
C
o
ntreras
tra
n
sport
-
helper: fi
x
sync iss
u
e on crashes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe Co
n
treras
tr
a
nsport-h
e
lper
:
trivial
c
l
eanu
p
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
F
elipe Cont
r
eras
tran
s
port
-
hel
p
e
r: pro
p
agate recv
l
ine() error pushing
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
F
el
i
pe
C
on
t
re
r
a
s
re
m
o
te-
h
elpers: m
a
ke recvline
r
eturn an er
r
o
r
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Fel
i
pe
Contreras
tr
a
n
s
p
ort-
h
elp
e
r:
r
em
o
v
e barely used x
c
hgline()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Felipe Contreras
prompt: fix missing
f
il
e
erro
r
s in zsh
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-14
Fe
l
ipe Contreras
remote-bzr:
t
rivial
t
est fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
Felipe Cont
r
e
ras
comp
l
eti
o
n: fix c
o
mple
t
i
ng args of
alias
e
d "
p
ush",
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
F
elipe Contreras
remote
-
bzr: add support
f
or
o
lder versio
n
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
Felipe Contreras
remote
-
hg
:
alwa
y
s normalize paths
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-04-09
Felipe
C
on
t
rera
s
remote-helpers: allow all tests running
from
a
ny dir
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Fel
i
pe Con
t
r
e
ra
s
remote: fix
status wit
h
branch
.
.
.
rebase=pres
e
rve
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe
C
ontr
e
ras
fetc
h
: add missin
g
d
ocu
m
enta
t
i
on
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Contreras
t: tr
i
vial whitespace c
l
ea
n
ups
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Contrera
s
abspath: trivial sty
l
e fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe Contr
e
ras
remo
t
e-hg
:
add tests for special fil
e
na
m
es
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
F
e
lipe Contreras
rem
o
te-hg: f
i
x
'
shared path
'
p
a
th
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-12-09
Felipe C
o
n
treras
re
m
ote-
h
elpers
:
add extra safety c
h
ecks
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-18
Felipe Co
n
treras
test-bzr
.
sh, test-hg
.
sh: allow running f
r
om any dir
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-18
Felipe Contreras
t
e
st-
l
ib
.
sh: convert $T
E
ST_DIRE
C
TORY
to an absolute
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-12
F
e
l
i
pe Co
n
treras
transport-helper: check for 'forced
u
pdate'
m
e
s
sage
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-11-12
Felipe Contreras
trans
p
ort-helper:
a
dd '
f
orce' t
o
'export' helpe
r
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
F
elipe Contreras
setup:
trivial style fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe
C
ontreras
run-
c
omman
d
: trivial st
y
le fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contr
e
r
as
diff:
trivial style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Fe
l
ipe Con
t
re
r
as
revision: triv
i
al style fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Feli
p
e Cont
r
eras
p
r
etty: trivial style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe
C
ontreras
describe: tr
i
vial
s
tyle f
i
xes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Fel
i
pe Contreras
tr
a
nspor
t
-helper:
t
rivial st
y
l
e
fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felip
e
Contreras
sha1-name: trivial
style clea
n
up
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Con
t
reras
b
r
anc
h
: trivial style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contreras
revision: a
d
d missin
g
inc
l
ude
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
F
elipe Contre
r
as
transport
-
helper: do
n
't updat
e
ref
s
in dr
y
-run
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Co
n
treras
tr
a
n
sport-helper: mis
m
erge fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
F
elipe
Contreras
t: repl
a
c
e
p
u
lls with
merges
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-31
Felipe Contre
r
as
merge: simpl
i
fy ff-o
n
ly op
t
ion
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-10-16
Felipe Contreras
alias: have SP around ari
t
h
m
etic operators
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-12
Felip
e
Contreras
A
d
d new @ s
h
ortcut for H
E
AD
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contre
r
a
s
rev-parse test: use standar
d
tes
t
f
un
c
tions for setup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Fel
i
pe Cont
r
eras
rev-parse tes
t
: use test_must_fail, not "if <comma
n
d
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felip
e
Cont
r
eras
rev
-
pars
e
t
e
st: mod
e
rnize quoting
a
nd whitespace
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe Contrer
a
s
f
a
st-export: refact
o
r
g
et_tags_and_duplicates()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe
C
o
ntre
r
as
fast-export
:
make extra_refs global
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe
C
ontrera
s
t: branch: fix broken
&& c
h
a
i
ns
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Fel
i
pe Contr
e
ras
t: br
a
nch: fix typo
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Fe
l
ipe Contr
e
ras
t: b
r
anch: trivial style fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-09-03
Felipe
Con
t
reras
sha1-name: pass le
n
a
rgument t
o
inter
p
ret_
b
ranch
_
n
ame()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
Felipe
C
o
ntr
e
ras
add: trivial style cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
Felipe Co
n
tr
e
ras
r
ese
t
: t
r
ivial s
t
yle cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
Felipe Contrer
a
s
b
ranch: trivial sty
l
e fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-31
Felipe Contr
e
ras
reset: trivial refactoring
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-30
Felipe Contreras
remote-hg: us
e
no
t
e
s
to keep track
of Hg revisions
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Fel
i
pe Cont
r
eras
remot
e
-helpers
:
cleanup
m
ore
g
lobal va
r
iables
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Fel
i
pe Cont
r
e
r
as
remot
e
-hel
p
ers: triv
i
al styl
e
fixes
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
F
e
lipe Contreras
remot
e
-hg: imp
r
o
v
e
basi
c
t
est
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contreras
remo
t
e-hg
:
add
mis
s
ing &&s
in the
t
e
st
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
F
e
l
ipe Contreras
r
emote-hg: fix test
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Con
t
reras
rem
o
te
-
bzr: mak
e
bz
r
b
r
a
n
ches c
o
n
f
ig
u
rabl
e
per-repo
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-29
Felipe Contreras
remote-bzr: f
i
x
export of utf-
8
authors
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-13
Felipe Con
t
reras
unp
a
ck-
t
rees: p
l
ug a me
m
o
ry
leak
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-12
Felip
e
C
o
ntreras
remote-hg: add sh
a
red r
e
po
u
pgra
d
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-08-12
F
eli
p
e Con
t
r
eras
remote-h
g
: ensure shared
repo is init
i
alized
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-09
Felipe Cont
r
e
ras
Makefil
e
:
u
se
$
^ to av
o
id listing prereq
u
isites on
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-07
Fe
l
ipe Contreras
build: do not install gi
t
-remote-
t
estgit
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-07
Felipe Contreras
build: generate and clean test scripts
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-06
Fe
l
i
pe Co
n
trera
s
sequencer
:
avoid leaking message buffer when
ref
u
sing
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Feli
p
e Contreras
sequencer: remove
u
s
e
l
e
ss indentation
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Felipe Con
t
reras
sha1_file: t
r
ivial style cle
a
nup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
F
e
l
i
pe Co
n
t
reras
read-cache: tr
i
vi
a
l
s
tyle cleanu
p
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
Fel
i
pe Contreras
read-ca
c
he: fix wrong 'the_ind
e
x' usage
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-03
F
e
l
ipe Contreras
test: fi
x
post rewrite h
o
ok report
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-06-02
Felipe Contreras
completion: avoi
d
ls-remote in
c
ertain sce
n
arios
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-29
Felipe Contreras
compl
e
tion: zsh: improve bash
s
cript loadi
n
g
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-29
Fe
l
ipe Contreras
prompt: fix for
s
i
mpl
e
reb
a
se
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Feli
p
e Co
n
treras
send-email: remove wa
r
n
ing a
b
out unset chainrepl
y
to
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Cont
r
e
ras
te
s
t: re
b
ase:
f
ix --
i
nteractive test
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
test: t
r
ivial cleanups
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
remote: tr
i
vial sty
l
e cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
F
e
lipe Contr
e
ras
remote-hg:
add support for --force
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contr
e
r
as
remote-hg: add support for
--dry-run
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Fe
l
ipe Con
t
reras
remote-hg: check if
a fetch is ne
e
ded
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
remote-h
g
: tr
i
vial cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Con
t
reras
remot
e
-helpers: impro
v
e mark
s
usag
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe
C
ontrer
a
s
re
m
ote-
h
g:
a
dd
c
heck_push()
h
e
lper
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Fel
i
pe Con
t
rer
a
s
remote-hg: ad
d
setup_big_pu
s
h() helper
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
re
m
ote
-
hg: r
e
m
o
ve files befo
r
e modifications
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe
Contreras
remote-hg: improve lightweight tag aut
h
or
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
remote-hg:
use
r
e
m
ote 'default' not local one
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Fel
i
pe Contreras
r
e
mote-
h
g: improv
e
bra
n
ch listing
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe
C
o
n
trer
a
s
rem
o
te-hg: simplify bran
c
h_tip()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe
Con
t
reras
remote-hg: check diverg
e
d
bookmarks
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Co
n
tre
r
a
s
rem
o
t
e
-h
g
:
pass arou
n
d revision r
e
fs
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Feli
p
e
C
ont
r
eras
remote-hg:
i
mp
l
e
ment c
u
stom checkhe
a
ds()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contrer
a
s
remo
t
e-hg:
i
mplement custom pus
h
()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
next