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: update copyright notice
2013-02-20
David Aguilar
t7
8
00
:
update copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Aguil
a
r
difftool: si
l
ence uniniti
a
lized variable w
a
r
nin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
u
i
l
a
r
p4
m
e
r
ge: fix p
r
i
n
tf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id Aguilar
difft
o
ol
-
-
h
elper: fix printf u
s
ag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
av
i
d Aguilar
doc: generate a li
s
t
of valid merge too
l
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguil
a
r
mergeto
o
l
--lib: add functions
for fin
d
ing a
v
a
i
lable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
Agu
i
la
r
mer
g
etool--lib: improve the help
t
ext in gu
e
ss_merge_t
o
o
l
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
-
-lib: si
m
pl
i
fy co
m
mand expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
r
getools: simpl
i
fy
h
ow we handle "vim"
and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
me
r
getool--lib: improve
s
how_tool_
h
elp() ou
t
put
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim: remove redund
a
n
t
d
i
ff comman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d Agu
i
lar
mergetoo
l
s/p4m
e
rge: Hon
o
r $TM
P
DIR for the
/dev/nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David
A
g
u
ilar
merg
e
tools/p4mer
g
e: Handl
e
"
/
dev/n
u
l
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David
Aguilar
mergetool--lib: Al
l
ow custom commands
to
override b
u
ilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename 'tagcont
e
nts' to
'cached_
t
a
g
content'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
Agu
i
lar
gitk:
T
each "Reread refere
n
ces"
t
o r
e
load tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mer
g
etool,difftool: Docum
e
nt --tool-help consisten
t
ly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difftool: Disable --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id Ag
u
ilar
diffto
o
l: Handle com
p
a
r
e() returning -
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool
:
Wrap long li
n
es fo
r
re
a
dability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
dif
f
to
o
l: Check a
l
l return codes from c
o
mpa
r
e()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d
A
g
u
ilar
diffto
o
l: Handle finding mergetools/ in a path
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l: Use symlink
s
w
hen diffing against the
w
orktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool
:
Call t
h
e
temp
directory "git-diff
t
ool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
i
fftoo
l
: Move option values into a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
d
i
fftool:
Eli
m
inat
e
global
variab
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avi
d
A
g
uilar
difftoo
l
:
Simplify print_t
o
ol_help(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Ag
u
ilar
t7800: Tes
t
d
i
ff
t
o
o
l passing
arg
u
ments
t
o d
i
ff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Agui
l
ar
m
e
rgetool: Provide an empty fi
l
e
when n
e
eded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Ma
k
efile:
Improve comp
i
ler head
e
r dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
merg
e
t
ools/m
e
ld: Use '--o
u
tput'
when availa
b
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
mergetool
-
-
lib: Refactor tools into se
p
arate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
erge
t
oo
l
--
l
ib: Mak
e
style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
difftool--h
e
lper: Make
style consi
s
tent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Ag
u
ilar
t/t7503-pre
-
co
m
m
it-hook
.
sh: Add
GI
T
_PREFIX t
e
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
git-mergetool--lib:
M
ake vimdiff retain the c
u
rren
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t: Remove ha
n
d
ling for GIT_P
R
EFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
s
etup:
P
rovide GIT
_
PR
E
FIX to
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodul
e
sync:
Update "submod
u
le
.
<
n
ame>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid
Aguilar
merget
o
ol: Skip aut
o
res
o
lved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Documentation: Explai
n
git-
m
ergetool'
s
use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Ag
u
ilar
Makefile: Remove usage of
d
eprecated Python
"
has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Ag
u
i
l
ar
difftool: Fix
'
--gui'
when
diff
.
gui
t
ool is
u
nc
o
nfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
A
g
u
i
lar
t
7
8
0
0-diffto
o
l
.
s
h
: Tes
t
mergetool
.
p
rompt
fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid
A
guilar
d
i
f
f
tool
:
Update copyright
n
ot
i
ces
t
o
li
s
t each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Agui
l
ar
difftool: Us
e
eval t
o
exp
a
nd '--e
x
tcmd' exp
r
ession
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool: A
d
d
'-x' and as an ali
a
s f
o
r
'
--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7
8
00-difftoo
l
.
sh: Si
m
plify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Ag
u
ilar
git-diff
.
txt:
Link
to gi
t
-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difft
o
ol: A
l
low specifying unconfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
tool--
h
elper:
R
emove use
of the GIT_MER
G
E_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
d
i
fftool--h
e
l
p
er
:
Update cop
y
right and remove distr
a
cti
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
uil
a
r
gi
t
-difft
o
ol: A
d
d
'--gui' for select
i
ng a GUI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
t
7800
-
difftool:
Set a
bogu
s
to
o
l fo
r
u
se b
y
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Ag
u
ilar
he
l
p: Do n
o
t unnecessari
l
y look for a r
e
pository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Agu
i
lar
submod
u
l
e
.
c: Squelch a "u
s
e b
e
f
ore
assignment" warnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Agu
i
lar
diff: generate pretty filenames i
n
p
r
ep_temp_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Agu
i
lar
c
o
mpat: add a ba
s
ename() compatibilit
y
functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
Agu
i
lar
compat: add a mk
s
temps() c
o
m
p
atibility
f
unctio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
A
dd git
-
replace to
.
giti
g
n
ore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
m
e
rg
e
tool--lib: add su
p
port
f
or ar
a
xis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
ilar
mergetool--li
b
: specialize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d Aguilar
mergetool--lib
:
simplify API usage by remo
v
ing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
diff
t
ool/mergetool: refactor commands to use gi
t
-
mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
merge
t
ool: use $(
.
.
.
) instead
of `bac
k
ticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completio
n
: add git-
d
i
fft
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agui
l
ar
difftool
:
add sup
p
o
rt for a difftool
.
pr
o
m
pt con
f
ig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
di
f
ft
o
ol: add va
r
ious git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
diffto
o
l: move 'git-difftoo
l
' out of contr
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
d
i
fftool: add a
-
y
sh
o
rtcu
t
for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguila
r
difftoo
l
:
u
se perl built-in
s
w
h
en
t
estin
g
for msy
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Ag
u
i
l
ar
d
if
f
tool: remove the backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
difftool: remove m
e
rge options for opendiff, tk
d
iff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
v
i
d
A
guilar
e
v
e
ry
d
a
y: use the d
a
sh
l
e
s
s
form of
git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/d
i
f
ftool: use a separate con
f
ig namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guilar
co
n
trib/d
i
fftool
:
Don'
t
repea
t
merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agui
l
ar
diffto
o
l
: put t
h
e curs
o
r
on th
e
editable fil
e
for V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vi
d
Aguilar
difftool: f
i
x docum
e
n
tation
p
r
o
blems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id Aguilar
contrib: a
d
d 'g
i
t
d
ifftool' fo
r
l
a
unching common
m
e
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Aguilar
git-mergetool: prope
r
ly han
d
le "gi
t
mergetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
avid Aguilar
tests: add a tes
t
case for
"git submodule s
y
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
git-s
u
bmodule: add "syn
c
" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguila
r
git-submodule: re
p
lace
duplicated code with
a
module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Dav
i
d Agu
i
lar
[PATCH] gitk: Don't show local changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree