repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Disable --symlinks on cygwin
2012-07-26
David Aguilar
difftool: Disable --
s
yml
i
nks
o
n
c
y
g
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
d
i
fftool:
Ha
n
dle comp
a
r
e() returning -
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
: Wrap l
o
ng li
n
es f
o
r rea
d
a
b
ility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Ag
u
ilar
d
i
ff
t
ool: Check all return codes from com
p
a
re
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
ifftool:
Handle findi
n
g
mergetools/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool:
Use symlinks when diffing a
g
ainst the worktre
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
ifftool: Call the t
e
mp d
i
rectory "git-di
f
ft
o
o
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difftool:
M
ove option values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: E
l
iminate gl
o
b
a
l
variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difft
o
o
l
: Si
m
p
lify print_tool_help
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
id Aguilar
t7
8
0
0
: Test difftool pa
s
si
n
g argument
s
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
Aguilar
me
r
getool
:
Provide a
n
em
p
ty f
i
l
e
wh
e
n
n
e
e
ded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefi
l
e: Improve compi
l
e
r
heade
r
d
e
p
e
ndency che
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vi
d
Aguilar
mergetools/
m
e
l
d
:
U
se '--output' when
available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
A
guilar
mer
g
etool--lib: Refact
o
r tools i
n
to separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
ui
l
ar
mer
g
etool--lib: M
a
k
e
styl
e
cons
i
sten
t
with gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
d
i
fftool--helper: Make style consistent
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David
A
guilar
t/t7503-pre-com
m
it-ho
o
k
.
sh: Add GIT_PREFIX te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergetool--lib: Make vi
m
diff retai
n
the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
g
it: Re
m
ove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
Aguilar
s
e
t
up: Provide GIT_PR
E
FIX to
b
uil
t
-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
sub
m
o
dule
s
ync: Update
"s
u
bmodule
.
<name
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
merg
e
tool: Skip autores
o
l
v
ed paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
avid Agui
l
ar
Do
c
umen
t
a
t
ion:
E
xplai
n
git-mergeto
o
l's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Ag
u
ilar
Ma
k
e
f
i
l
e: Rem
o
ve usa
g
e of
deprecated
P
ython "h
a
s_ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id
A
guilar
difftool: Fix
'--
g
ui' wh
e
n diff
.
guitool
i
s unconfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
av
i
d Aguilar
t7800-difftool
.
sh
:
Test mergetool
.
prom
p
t fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difft
o
ol: Update
c
opyright not
i
ces to lis
t
each y
e
ar
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guil
a
r
diffto
o
l:
U
s
e eval
to expand '--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
diff
t
o
ol:
Add '-x' and as a
n
al
i
a
s
f
or '--
e
xtcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t780
0
-difftool
.
sh:
S
i
m
plify the --extcm
d
t
e
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
git-diff
.
txt: Link t
o
g
i
t
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
a
r
diff
t
ool:
A
l
l
o
w sp
e
cifying
unconfigured
c
om
m
ands
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
d
i
fftool--h
e
lper: Re
m
o
v
e use
of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Agu
i
lar
difftoo
l
-
-
h
elp
e
r: U
p
da
t
e copyri
g
ht and re
m
ove distract
i
ng
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
i
d Aguilar
git-difft
o
ol: Add '--g
u
i' f
o
r selecting a
G
UI
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t7
8
0
0
-diff
t
ool
:
Se
t
a bogus tool
f
or use
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
he
l
p: Do not
u
n
n
ecessarily look for a
r
epos
i
tor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d
A
g
uila
r
s
u
bmodule
.
c
:
S
q
u
e
lch
a "us
e
before assignme
n
t" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
lar
diff: generat
e
pre
t
t
y fi
l
enames in p
r
ep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguila
r
c
ompat: add a bas
e
name() compatibi
l
it
y
fu
n
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkstemp
s
() c
o
mpatib
i
lity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
Add git-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
avid
A
guila
r
mergetool--lib: add support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Agui
l
ar
mergetoo
l
--
l
ib: specialize diff options
f
or emer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vi
d
A
g
uilar
m
ergetool--lib: simpli
f
y
API usa
g
e by remo
v
ing mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
diff
t
ool/merget
o
ol
:
refactor com
m
ands to use git
-
mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
merget
o
ol: use $(
.
.
.
) inst
e
ad of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
bash completio
n
:
add gi
t
-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: add suppor
t
for a difftool
.
promp
t
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
i
fftool:
add v
a
r
i
ous gi
t
-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
diff
t
ool:
mo
v
e 'git-difftool' out
o
f contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difft
o
ol: ad
d
a
-y shortcut for --no-prom
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
difftool: u
s
e per
l
built-ins when testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove
t
he backup fi
l
e feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove merge o
p
t
ions for opendif
f
, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid A
g
u
ilar
everyday
:
u
se the dashless form o
f
g
i
t-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
t
rib/difftoo
l
: us
e
a
sepa
r
ate con
f
ig namespa
c
e fo
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Agui
l
ar
c
o
ntrib/difftool: Don't r
e
p
eat merge
t
o
o
l
c
andidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d
Aguilar
difftool: put the
cursor on the edit
a
ble file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
t
o
ol: fix documentation proble
m
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
c
ontrib: add
'git difftool' for
laun
c
hing co
m
mon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git-mergeto
o
l: prope
r
ly handle
"
git m
e
rgetool --
fi
l
ename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
A
g
uilar
tests: add a
test
c
ase for "git subm
o
dule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Agui
l
ar
g
i
t-submodule: add "
s
ync" co
m
m
a
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-su
b
module: replace
d
u
plicated co
d
e
with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
v
i
d Aguila
r
[
P
ATCH] gitk:
D
o
n
'
t
show local chang
e
s
when w
e
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree