repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' of git://github.com/git-l10n/git-po
2013-02-03
Dav
i
d
Aguilar
doc: generat
e
a
list of
v
alid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguilar
merge
t
ool--li
b
: add
fun
c
tions
fo
r
findi
n
g av
a
ilabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
merg
e
tool--lib: improv
e
t
h
e h
e
l
p text in
g
uess_
m
erge_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
id Aguilar
mergetool--lib: si
m
pli
f
y command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mergetool
s
:
simpli
f
y ho
w
we handle "vim" and "de
f
aults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
mergetool
-
-lib: improve show_tool_
h
elp()
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mer
g
etoo
l
s
/
vi
m
: remove redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
m
er
g
etools/p4merge: Honor $TM
P
DIR for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mer
g
et
o
ols/p4merge: Handle "/dev
/
n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguil
a
r
mergetool-
-
l
i
b: Allow cust
o
m co
m
mands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: Rename 'ta
g
contents' to 'ca
c
hed_tagco
n
tent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
la
r
g
itk: Teach
"
Re
r
e
a
d
refe
r
en
c
es" to relo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id
Aguil
a
r
merge
t
ool,d
i
fft
o
ol:
Docume
n
t --too
l
-h
e
l
p consist
e
ntly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difftool:
D
isa
b
l
e
--symli
n
ks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
dif
f
tool: Handle compare(
)
re
t
ur
n
ing -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guila
r
difftool: Wr
a
p
long l
i
nes for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Agui
l
ar
difft
o
ol: C
h
e
c
k all return
codes
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
dif
f
tool
:
H
a
ndle fi
n
ding m
e
rgetools/
in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d Aguilar
difftool: Use sy
m
links when
di
f
fi
n
g against the worktre
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Ag
u
ilar
diffto
o
l: Cal
l
the temp directory
"git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Move option va
l
u
e
s into a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool: Elimin
a
t
e gl
o
bal variable
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
ool:
S
implify
p
rint_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Agu
i
lar
t7800:
T
est difftool passing argument
s
to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agui
l
ar
m
ergeto
o
l: Provide an empt
y
fil
e
when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
Aguilar
Makefile: Improve compiler header dep
e
n
d
ency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
mer
g
etools/meld: Use '--o
u
t
put' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergeto
o
l--lib: Refactor tools into s
e
parate file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergeto
o
l--lib: M
a
ke
style co
n
sisten
t
w
ith git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d A
g
u
ilar
dif
f
tool--helper: Mak
e
style consistent
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguilar
t/t7503-pr
e
-commit-hook
.
sh: Add GIT_PREFIX tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool--lib: Make vimd
i
ff retain the curre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Agui
l
ar
git:
Remove handlin
g
for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d
Aguil
a
r
setup
:
Provide GI
T
_PREFIX t
o
built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
Aguilar
submo
d
u
le sync: Update "su
b
m
o
dule
.
<name
>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Aguila
r
mergetool: Skip autores
o
lved pa
t
hs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid
A
guilar
Documentation: E
x
plain git-mergetoo
l
's use of tem
p
ora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agui
l
ar
Makefile: Re
m
ove usage of dep
r
e
c
ated Python "
h
as
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Aguilar
d
i
f
f
tool: Fix
'
--gui' when diff
.
gu
i
t
ool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d Aguilar
t
7
8
00-di
f
ft
o
ol
.
sh: Test mergetoo
l
.
prompt fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
avid A
g
uilar
difftoo
l
:
Updat
e
copyright noti
c
es to list each
y
e
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
d
i
fftool: Use eval to exp
a
nd '--extcmd
'
e
x
pressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add '-x' an
d
as an
a
l
i
as for '--e
x
t
cmd
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid
A
gu
i
lar
t7800-
d
ifft
o
ol
.
sh: Sim
p
lify
t
he
-
-
e
xtcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
g
i
t-diff
.
txt: L
i
n
k
t
o
git-d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow specifyi
n
g
un
c
onfigured com
m
ands wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
di
f
ftool--helper: Remove us
e
of the GIT_MERG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool--
h
elpe
r
: Up
d
ate copyright and remo
v
e
d
istractin
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add '--gui' for
s
electing
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-d
i
ff
t
ool: Set a bogus tool for us
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
help: Do no
t
unn
e
cessa
r
i
ly l
o
ok
f
o
r
a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid Aguilar
submodul
e
.
c: Squelch
a
"use b
e
fore a
s
signmen
t
" warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uila
r
diff: generate pretty filenames in prep_t
e
mp_blo
b
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
com
p
at: add
a
basename()
c
o
m
pat
i
bi
l
ity fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
c
o
mpa
t
:
a
dd a mkste
m
ps()
c
ompa
t
ibil
i
ty
f
un
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
A
d
d
git-replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--
l
ib: add s
u
pp
o
rt for
a
r
axis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
mergetool-
-
lib: speci
a
lize diff option
s
f
or emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetoo
l
--lib: simplify A
P
I usage by
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
difftool/me
r
g
e
to
o
l: refactor commands t
o
us
e
g
i
t-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Agu
i
lar
m
e
rgetool: use $(
.
.
.
) instead of `
b
ackticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
ila
r
bash completion:
add
g
it-d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add support for a difft
o
o
l
.
prompt
conf
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool:
a
dd va
r
i
ous gi
t
-di
f
ftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
dif
f
tool: move
'
g
i
t-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: a
d
d a -y
short
c
ut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use perl built
-
ins when te
s
ti
n
g
for
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove the ba
c
kup
f
ile feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool:
remov
e
merge options
f
or
o
p
e
ndiff
,
tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid Aguilar
eve
r
y
day:
use th
e
das
h
l
ess
f
o
r
m of git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Ag
u
ilar
co
n
trib/di
f
f
tool: use
a separ
a
te
config
n
am
e
space
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Agui
l
ar
contrib
/
difftool:
D
on
'
t repe
a
t merge t
o
ol ca
n
didates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uila
r
difftool: put th
e
cur
s
or on the editabl
e
file for
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftool: fi
x
docume
n
t
a
t
i
on p
r
oblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
con
t
rib: add 'gi
t
d
i
fft
o
ol'
for la
u
n
c
h
i
ng common
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David
A
guilar
git-mergetool
:
pr
o
p
e
rly handle
"
git
m
e
rg
e
t
o
o
l -- f
i
lename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d
Aguilar
tests: add a te
s
tcase fo
r
"git
s
ubmodule s
y
nc
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
v
id A
g
uilar
git-submodule: add "syn
c
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Agu
i
lar
g
it-sub
m
odule: replace duplicated cod
e
with
a
mod
u
le_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[PA
T
CH
]
gitk
:
Don't show loc
a
l ch
a
n
g
es when
w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree