repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Use symlinks when diffing against the worktree
2012-07-23
David Aguilar
difftool
:
Use
symlinks w
h
en
d
iffin
g
a
gai
n
s
t the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
Aguilar
di
f
ftool
:
Call the te
m
p direc
t
ory "git-
d
ifftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difft
o
ol: Move option v
a
lue
s
into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Ag
u
ilar
diff
t
o
ol: El
i
minate g
l
obal variabl
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uil
a
r
difftool: Simpl
i
fy pri
n
t_tool
_
help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t78
0
0:
T
est d
i
fftool p
a
ssin
g
arguments to di
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid Agu
i
lar
m
e
r
g
e
t
ool: P
r
ovide an empty file when n
e
eded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
Ag
u
ilar
Makefile: I
m
prove com
p
iler
h
eader
d
epe
n
dency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguila
r
mer
g
eto
o
l
s
/meld: Use '--output' when avai
l
able
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
mer
g
etool--l
i
b: Refactor too
l
s
i
nto separ
a
te files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
mer
g
etool--lib: Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Aguila
r
diff
t
ool-
-
helper: Make styl
e
co
n
s
i
ste
n
t wi
t
h git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Aguilar
t/t7503-
p
re-
c
omm
i
t-
h
o
ok
.
sh: Add GIT_PREFIX
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
it-m
e
rgeto
o
l--lib: Make vimdi
f
f
r
etain the
c
urren
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: R
e
move handlin
g
for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup:
Pr
o
vide GIT_PREFIX to bui
l
t-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id Agu
i
lar
s
ubmodule s
y
nc: U
p
date "
s
ubmo
d
ule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Aguil
a
r
mergetool:
S
kip a
u
toresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguilar
Documentation: Explai
n
git-mergetool'
s
use of te
m
p
ora
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid
A
guilar
Makef
i
le: Remove
u
s
a
g
e of depreca
t
ed
Python "has_
k
ey
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid
A
guilar
difftool: Fix '--gui
'
when diff
.
guitool is unconfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7
8
00-dif
f
too
l
.
s
h
:
Test mergetool
.
prompt fallba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
i
f
f
too
l
:
Update
c
o
pyright notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use
e
val
to expand '
-
-extcmd'
e
xpressi
o
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftoo
l
: Add '
-
x' and as
a
n alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
t78
0
0-difftool
.
s
h: Simplif
y
the --extcmd
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
gui
l
ar
g
it-diff
.
txt: Link to git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
i
l
a
r
difftool
:
Allow specifying
u
nconfigure
d
comm
a
n
d
s with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
ifftool--he
l
p
er: Remove
u
s
e of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguila
r
di
f
ftool--hel
p
er: U
p
dat
e
copyr
i
g
ht a
n
d rem
o
ve dist
r
acti
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-dif
f
tool: Add '--gui'
f
or selecting a G
U
I tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
t7800-difftool:
Set a
b
o
g
us tool for use by
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguil
a
r
help: Do not unnecessaril
y
look
f
or a
repositor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
i
d Ag
u
ilar
submod
u
le
.
c: S
q
u
e
lch a "us
e
be
f
ore assignmen
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: generate
p
retty
filenames
i
n p
r
ep_temp_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
la
r
compat:
add a basename() comp
a
tibi
l
ity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
mpat: add
a
mkst
e
mps()
c
omp
a
t
i
bility func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
A
d
d git-replace to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vi
d
Aguil
a
r
mergetool
-
-
l
ib
:
a
d
d sup
p
ort for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vi
d
A
g
u
i
lar
merget
o
ol--l
i
b: specializ
e
diff
options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
merget
o
ol--lib: simplify API us
a
ge b
y
rem
o
v
i
ng more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergeto
o
l
:
refa
c
tor com
m
ands to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
merget
o
ol: use $(
.
.
.
)
instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
ba
s
h c
o
mpletion:
add gi
t
-diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
d
ifftool: add support fo
r
a difft
o
ol
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifft
o
ol: add
v
a
r
i
ous git-diff
t
ool t
e
s
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
d
ifftoo
l
: move '
g
it
-
difftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gui
l
ar
dif
f
tool: add a -y short
c
ut for --no-p
r
o
m
pt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difft
o
o
l: use p
e
r
l
b
u
ilt-ins wh
e
n
t
e
sting for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agui
l
ar
di
f
ftool:
rem
o
ve the backup fil
e
featu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: remo
v
e merge o
p
t
ion
s
for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
v
id
Aguilar
everyday: use the dashless form of
g
it-
i
nit
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
av
i
d
Aguilar
c
o
ntrib/d
i
ff
t
ool:
u
s
e
a separate
config
n
amespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
co
n
t
r
ib/difftool: Don't repeat merg
e
tool
candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
u
i
lar
d
ifftool:
p
u
t the cu
r
sor
on the
editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: fix
d
o
c
um
e
n
ta
t
ion proble
m
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Agui
l
ar
contrib: add '
g
i
t
d
if
f
tool'
for launching common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid
Aguilar
git-mergetool: properly handle "git mer
g
eto
o
l
--
f
ilen
a
me"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Aguilar
tests: add a testcase for "g
i
t sub
m
odule s
y
nc"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id
A
g
ui
l
ar
git-sub
m
odule:
add "sync" co
m
ma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguila
r
git-submodule
:
replace dupli
c
ated
c
o
de with a mod
u
le_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id Aguilar
[PATCH
]
gitk: Don't
s
how local
chan
g
es wh
e
n we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree