repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with 'maint'
2022-08-10
Felipe Con
t
reras
m
e
rgetools:
v
imdi
f
f: simpl
i
f
y
tabf
i
r
s
t
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2022-08-10
Felipe Contreras
me
r
getools
:
v
i
mdiff: fix single window layouts
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2022-08-10
Felip
e
Contrera
s
m
e
rgetools: vimdiff: r
e
work tab l
o
gic
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2022-08-10
Felipe Contrer
a
s
merge
t
ools: vi
m
d
i
ff: fix for diff
o
p
t
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2022-08-10
Felipe Contreras
merg
e
tools: vi
m
diff
:
silence an
n
oying
messages
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2022-08-10
F
e
lipe Co
n
t
r
e
r
as
mergetools: vi
m
diff: make vimdiff3 actu
a
lly work
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2022-08-10
Fel
i
pe C
o
ntreras
m
erget
o
ols: v
i
mdiff:
fix comm
e
nt
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-08-18
Fe
l
ipe Contreras
completion: bash:
a
d
d
correct su
f
fi
x
in varia
b
les
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-08-18
Felipe
C
ontre
r
as
completi
o
n:
b
ash: f
i
x for
m
ultiple das
h
commands
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-08-18
Felipe Contreras
c
om
p
letion
:
bas
h
: f
i
x
for subopti
o
ns with val
u
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-08-18
Felipe Co
n
treras
completio
n
: ba
s
h:
fix p
r
efix detection i
n
br
a
nch
.
*
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-08-06
F
elipe Contr
e
ras
test:
f
ix for COL
U
MN
S
and
ba
s
h 5
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
F
e
li
p
e Co
n
trer
a
s
doc: pull:
f
ix rebase
=
fals
e
document
a
tion
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-19
Felipe Contreras
p
ull: trivial wh
i
tespace sty
l
e fix
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-19
Felipe Contreras
pull: tri
v
ial clea
n
up
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-19
Felipe Contreras
pull:
c
leanup autostash c
h
eck
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
F
e
l
i
pe
C
o
ntreras
comment
s
: avoid usin
g
the gend
e
r
o
f our users
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
Fel
i
pe Contre
r
as
doc: avoid using the gend
e
r of other people
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-08
Felipe
Contreras
doc: merge: m
e
ntion default of defaulttoupst
r
e
am
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe C
o
ntreras
p
u
sh: don't ge
t
a
full remote ob
j
ect
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
F
e
lipe C
o
ntreras
push: only check same_
r
emote
when
needed
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Fe
l
ipe Contreras
push: remove trivial function
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe C
o
ntre
r
as
push: re
m
o
ve
redundant chec
k
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe Contreras
push:
f
a
c
tor out the typical
case
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felip
e
C
ontreras
push: get r
i
d of a
l
l the
setup_push_* functions
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Fe
l
ipe Contre
r
a
s
pus
h
:
triv
i
a
l simplifications
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
F
e
lipe Con
t
reras
push: make set
u
p_p
u
sh_
*
return the dst
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe Contreras
pu
s
h: on
l
y ge
t
the
branch when neede
d
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Fel
i
pe Contreras
push:
f
act
o
r out null branc
h
check
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe Contreras
push: s
p
li
t
switch cases
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe Contrer
a
s
push: return immediate
l
y i
n
triv
i
al switch case
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
F
elipe
Co
n
t
r
e
ras
push: cre
a
te
new
g
e
t
_
u
pstream_r
e
f
(
) helper
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
F
e
lipe Contreras
do
c
:
p
us
h
: exp
l
ain default=simple co
r
r
ect
l
y
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe Contreras
push: rem
o
ve u
n
use
d
c
ode in setup_push_upstr
e
a
m()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe C
o
ntrer
a
s
push: s
i
mplify se
t
up_
p
u
s
h_simple()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
F
elipe Contre
r
a
s
p
u
sh:
r
eorganize
s
e
t
up_pus
h
_
s
imple()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
F
elip
e
Con
t
r
eras
push: cop
y
code to setup_push_simp
l
e()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Felipe
Contreras
push
:
h
e
dge code of
d
efau
l
t=
s
imple
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
F
elip
e
C
o
ntreras
push: rename !triang
u
lar to sam
e
_re
m
ote
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-05-24
Fel
i
p
e Contreras
do
c
: avoid using
r
m
d
i
rec
t
ly
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-05-24
Fel
i
pe C
o
ntr
e
ras
do
c
: sim
p
lify
Makefile using
.
DELETE
_
ON
_
ERROR
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-05-24
Felipe Co
n
treras
d
o
c: rem
o
ve unnec
e
ssary rm instances
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-05-24
Felipe
C
ontr
e
ras
doc:
improve asciidoc
d
ependenci
e
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-05-24
Felip
e
Con
t
reras
doc: refa
c
tor common asci
i
d
oc depe
n
dencies
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Fe
l
ipe Co
n
treras
completi
o
n
:
add proper public __gi
t
_co
m
pl
e
t
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Felipe
C
ontre
r
as
tes
t
: completion: add tests f
o
r __git_c
o
mplete
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Felipe
C
o
ntreras
completion: bash: i
m
prov
e
func
t
ion detectio
n
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Fe
l
ipe C
o
n
treras
co
m
ple
t
i
on:
bash: add __
g
it_have_func helper
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-21
Felipe Co
n
trera
s
test: bisect-porcelain: fix location of
files
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Felipe C
o
ntreras
pul
l
: d
i
s
play de
f
au
l
t warni
n
g
only when non
-
ff
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Felipe
C
ontreras
pull: gi
v
e
the advice for choosing
r
ebase/me
r
ge much
.
.
.
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Feli
p
e
Contrer
a
s
pull: r
e
factor fast-forward check
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-07
Felipe Contrer
a
s
c
o
m
pletion:
b
ash: fix git
k
alias regression
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Feli
p
e Contrer
a
s
completion: zsh:
fix file completion regression
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Felipe Contreras
tests:
lib-fu
n
c
t
ions: trivial style clea
n
ups
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Felip
e
Co
n
trer
a
s
test: co
m
p
letio
n
: fix typo
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Felipe
Contr
e
r
as
.
gitignore: remov
e
dan
g
ling file
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
F
e
lipe Contreras
refspec: trivial cl
e
anup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-11-30
F
elipe Contreras
refspec:
make @
a
s
y
nonym of
HEAD
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-11-30
Felipe Con
t
rera
s
t
e
sts: push: triv
i
al cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-11-30
F
elip
e
Contrer
a
s
tests
:
push: i
m
p
r
ove c
l
eanup of HEAD test
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-11-17
F
elipe Contreras
completion: bash: impr
o
v
e ali
a
s loop de
t
ection
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-11-10
Felip
e
Contreras
completion: bash: check for alias lo
o
p
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-11-10
Felipe Contreras
completion: bash: support recursive a
l
iases
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contrer
a
s
zsh: update copyright
n
otices
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Cont
r
e
r
as
c
o
mpletion:
b
a
s
h
:
rem
o
ve
old
com
p
at wrapp
e
rs
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Fe
l
ipe
Co
n
treras
co
m
p
l
etio
n
: bash
:
cle
a
nup cyg
w
in c
h
eck
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contreras
compl
e
tion: bash: tr
i
vial cl
e
a
nup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe C
o
ntreras
completion: zsh: add
simple
version check
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe
Contrera
s
co
m
pletio
n
:
zsh: trivia
l
s
i
mplificatio
n
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe
Contrera
s
completion
:
zsh:
a
dd a
l
ias descrip
t
ions
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
F
elipe Con
t
reras
co
m
pletion
:
zsh
:
im
p
rove command tag
s
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
F
e
lipe Contreras
c
o
m
pletion: zsh: r
e
fact
o
r command completion
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
F
e
lipe Cont
r
eras
completi
o
n: zsh: shuffle
fun
c
tions
aro
u
n
d
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Co
n
tr
e
ras
completion: zsh: simplif
y
file_
d
irect
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
F
elipe Contreras
com
p
letion: zsh: simp
l
ify
n
l
_append
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Co
n
treras
c
o
mpletion: zsh: trivia
l
cleanu
p
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contr
e
r
as
completion:
z
sh: simplify direct
com
p
ad
d
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contreras
completion: zsh: simp
l
i
f
y
c
ompadd functions
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contreras
completion
:
zs
h
: fix
s
plitting of words
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Cont
r
era
s
comp
l
et
i
on: zsh: add m
i
ssi
n
g direct_append
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contreras
co
m
p
letion: fix conflict with
bashcomp
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contreras
compl
e
tion:
z
sh
:
fix
c
ompletion for --no-
.
.
o
p
tions
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
F
e
lip
e
Cont
r
eras
c
ompletion: bash: remove zsh wrapper
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contr
e
ras
completion: ba
s
h: synch
r
o
nize zsh wrapper
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Fe
l
ipe Contreras
c
omple
t
ion: zsh: fi
x
for
c
omman
d
alia
s
ing
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
F
elipe Con
t
rer
a
s
co
m
pletion: prompt: fix c
o
lor for
Zsh
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-28
Felipe Contreras
comple
t
ion:
z
sh:
updat
e
sla
v
e script locations
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Felipe
Contreras
completion: zsh: fix for directories wi
t
h spaces
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Felipe Contrera
s
c
o
m
p
let
i
o
n: z
s
h
:
re
o
rganize install instructions
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Fe
l
ipe Contreras
co
m
pletion: zsh: fix
bash script
e
xtension
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Felipe Con
t
r
eras
completion: zsh: fix name due to broken
autoloading
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2020-10-26
Fel
i
pe Contreras
completion: zsh: fix _
_
g
itcomp_
d
irect()
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2019-06-04
Feli
p
e Contrer
a
s
fetch:
f
ix regression wi
t
h tr
a
nsp
o
rt h
e
lpers
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2019-06-04
Felipe C
o
nt
r
eras
f
etc
h
: make
the
c
ode
more
u
nder
s
tanda
b
le
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2019-06-04
F
e
lipe C
o
nt
r
eras
fetch: trivi
a
l cleanup
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2019-06-04
Felipe Co
n
treras
t5801 (r
e
mot
e
-helpe
r
s): add test
t
o fet
c
h tags
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2019-06-04
Felipe C
o
ntr
e
r
as
t
5801 (remote-he
l
pers)
:
clea
n
up
r
efspec stuff
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2016-05-17
Fe
l
i
p
e Co
n
t
r
e
ra
s
f
a
st-import: do not truncate exp
o
rted marks fi
l
e
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
2014-05-20
Feli
p
e Con
t
rera
s
contri
b
: r
e
mote-h
e
lpers
:
add move war
n
ings (v2
.
0)
Signed-off-by:
Felipe Contreras
<felipe.contreras@gmail.com>
commit
|
commitdiff
|
tree
next