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
t7800: "defaults" is no longer a builtin tool name
2013-02-21
D
a
vid Aguilar
t7800: "d
e
f
a
ults
"
is
no longer a
bu
i
l
t
in tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Ag
u
ilar
t78
0
0
:
modernize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Agu
i
lar
t
7
800: u
p
date copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
ifftool: silence
u
n
i
ni
t
ialized
variable warni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
A
guilar
p4merg
e
: fix pr
i
ntf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
ifftool--he
l
per: fix p
r
intf
usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
lar
doc: gene
r
ate a
l
ist of
valid
m
e
rge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Ag
u
ilar
mergetool
-
-lib
:
a
dd functions for fin
d
ing available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
-
-
lib: im
p
rove the help t
e
xt i
n
guess_m
e
r
g
e_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
ui
l
ar
m
e
rgetool
-
-lib: simplify com
m
and e
x
pression
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
mergetools: simplify how we han
d
le
"
vim" an
d
"defaults
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
m
e
rgetool--lib
:
im
p
rove show_tool_help
(
) output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
i
d Aguilar
me
r
getools/vim: remo
v
e redund
a
nt diff comm
a
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Agu
i
lar
m
ergetools/p4merge: Honor $TM
P
D
IR f
o
r the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguil
a
r
merge
t
ools/p4merge: Handle "/dev/nul
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
me
r
g
etool--lib: Allow cu
s
t
om commands to override built-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rena
m
e 't
a
gcontents' to
'ca
c
h
e
d
_tag
c
o
n
t
e
nt'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Agu
i
la
r
gitk
:
T
e
ach "Reread referen
c
es" t
o
re
l
oad
tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,d
i
fftool:
Document --to
o
l-help
c
onsistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
d
ifftool
:
Dis
a
ble --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fftoo
l
: Handle
compare() re
t
urning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
A
guil
a
r
difftool
:
Wrap
long lines f
o
r rea
d
ab
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d
Aguil
a
r
difftool:
Check
a
l
l return codes from
compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
diffto
o
l
:
Ha
n
dle findi
n
g merg
e
to
o
ls/
in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
il
a
r
d
i
fftool:
Use s
y
mlinks w
h
en
d
iff
i
ng aga
i
n
s
t
t
he worktre
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
diffto
o
l: C
a
ll th
e
temp dire
c
tory "
g
it-diff
t
ool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: M
o
v
e
option values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
f
t
ool: Elimi
n
ate gl
o
bal variable
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l
:
Simplify print_tool_
h
elp
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800:
T
est difftool passing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Agui
l
ar
mergetoo
l
:
Provide a
n
emp
t
y
file when neede
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid Aguilar
Makefile: Im
p
ro
v
e compiler heade
r
dependency chec
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Ag
u
il
a
r
mergetools/meld: Use '--
o
u
tpu
t
' w
h
en
a
vailable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ool--lib: R
e
factor tools into separate
f
iles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
erg
e
tool-
-
li
b
: Make style consist
e
nt wit
h
gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
l
a
r
di
f
ftool--helper
:
Make style
con
s
is
t
e
n
t with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-
p
re-comm
i
t-
h
ook
.
sh: A
d
d GIT
_
PR
E
FIX te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
git-me
r
getool--lib: Make vimdiff retain the curren
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git
:
Remove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguil
a
r
set
u
p: Pr
o
vide
G
IT_PREFI
X
to built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
sub
m
od
u
l
e syn
c
: Update "submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid
A
guila
r
m
e
r
g
e
tool:
Sk
i
p
auto
r
esolved
p
a
ths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David A
g
u
i
lar
Documentation: Explain git-me
r
g
etool's use o
f
tempo
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
A
g
ui
l
ar
Make
f
ile: Remove usage
o
f depre
c
at
e
d Py
t
h
o
n "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguil
a
r
d
i
fftool: Fix
'--gui' when dif
f
.
guit
o
ol i
s
unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-d
i
f
f
to
o
l
.
sh: Test mergetool
.
prom
p
t
fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool:
U
pdat
e
c
opyright notic
e
s to list each
y
ear
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftoo
l
: Use eval to
expand '--ext
c
md' e
x
pressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avi
d
A
g
uilar
difftool: Add '-x' and as an alias
f
or '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
t7800-difftool
.
sh: Si
m
pli
f
y
t
h
e
--extcm
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
gi
t
-diff
.
t
xt: Link to git-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Aguilar
di
f
ftool:
A
llow
speci
f
ying unc
o
n
figured
c
o
mmands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid
A
guilar
difftool--helper
:
Remove use of
t
he GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d
A
guilar
d
iff
t
ool--h
e
lper:
U
pdate c
o
p
y
ri
g
h
t and r
e
move distr
a
cting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
gi
t
-difftool: Add '--gui' f
o
r selecting a GUI too
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
i
l
a
r
t7800-difftoo
l
: Se
t
a bogus t
o
ol for
use
b
y tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
guilar
hel
p
: Do not
u
nne
c
essarily look
f
or
a
repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c:
Squelch a "use before ass
i
gnme
n
t" w
a
rning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff: generate
p
retty
file
n
a
mes in prep_tem
p
_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompa
t
: add a basen
a
me()
compa
t
ibi
l
i
t
y function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
compat
:
ad
d
a mkstemps() c
o
mpa
t
ibi
l
ity f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
Aguilar
Ad
d
gi
t
-replace to
.
g
iti
g
nore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agui
l
ar
mer
g
etool--
l
ib: add suppo
r
t f
o
r
araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Agu
i
lar
mergetool--l
i
b
: spec
i
alize di
f
f opti
o
n
s
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
i
d
Agui
l
ar
me
r
ge
t
o
o
l--
l
ib: simplify API usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool/mer
g
eto
o
l
:
refactor commands to use
g
it
-
me
r
get
o
ol
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
mergetool: us
e
$(
.
.
.
) instea
d
of
`
b
a
c
kticks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash co
m
plet
i
on: add git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Ag
u
i
l
ar
difftool: add support for a di
f
f
tool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uil
a
r
di
f
ftool: add v
a
rious git-d
i
ffto
o
l tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difft
o
ol:
move 'git-d
i
fftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id A
g
uilar
diff
t
ool: add
a
-y shortcut
for --no-promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
: use
p
erl built-ins when
t
estin
g
for ms
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d
Aguil
a
r
difftool: remove the
ba
c
kup
f
ile
feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: r
e
m
ove
m
erge option
s
for
o
pendiff, tkdi
f
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
veryday:
u
se the d
a
sh
l
ess fo
r
m of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Ag
u
ilar
contrib/difft
o
ol: use a
sep
a
rate config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guilar
contr
i
b/di
f
ftool: Don
'
t repe
a
t
merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
u
ila
r
difftoo
l
: put the curs
o
r on the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid A
g
u
ilar
d
ifftool: fix documentation
p
roblem
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid Aguilar
c
o
ntri
b
: add 'g
i
t difftoo
l
'
for launching co
m
mon merg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
avid Aguila
r
g
i
t-m
e
rgetool: proper
l
y
handle
"
git m
e
rgetool
-
- fi
l
e
name"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a te
s
tcase for
"
git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d Aguilar
git-submodule: add "
s
ync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
av
i
d Aguilar
g
i
t-submod
u
le: r
e
place duplicated
c
ode with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
u
i
lar
[PATCH] gitk: Don'
t
sho
w
local c
h
anges when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree