repo.or.cz
/
git.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
D
a
vi
d
Aguilar
d
i
fftool
:
Disable --sy
m
l
i
nks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d Ag
u
ilar
d
ifftool: Handle c
o
mpare()
returning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
diff
t
o
o
l:
Wrap
long lines fo
r
readabi
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uil
a
r
difftool: Chec
k
al
l
return
c
o
des fr
o
m
c
o
mpa
r
e()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
ar
difftool: H
a
ndle finding mergetoo
l
s/ i
n
a path wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguila
r
difftool: Use symlinks w
h
en diffing against the wo
r
ktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
ffto
o
l: Call
t
he temp dire
c
tor
y
"git-d
i
f
ftool
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
t
ool: M
o
ve opt
i
on v
a
lues
i
nto a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool:
Elim
i
nate global va
r
i
a
b
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agu
i
la
r
d
ifftool: Simpl
i
fy print
_
tool_he
l
p()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
i
d Agu
i
lar
t7800: Test
diff
t
ool
p
a
ss
i
ng a
r
guments t
o
diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Ag
u
ilar
m
e
rg
e
too
l
: Prov
i
de an empty f
i
le when n
e
eded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
A
g
uilar
Makefile: Im
p
rove com
p
i
l
er header
d
ependen
c
y check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
merget
o
ols/meld: U
s
e
'
--o
u
tput' when availa
b
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
mergeto
o
l--lib: Refactor tools into separa
t
e files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
mergetool--l
i
b
:
Make style c
o
nsis
t
ent w
i
th git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
A
guilar
difftool--helper:
M
ake style consistent with
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
Agu
i
lar
t/t7503-pre-com
m
it-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
g
i
t-mergetool--l
i
b: Make vimdiff re
t
ain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Agui
l
ar
git: Remove hand
l
ing fo
r
GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
e
tup:
Provide GIT_PREFIX to bui
l
t-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Aguilar
s
ubmodule sync: Update
"
submo
d
ule
.
<
n
a
m
e>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
m
e
rgetool: Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
i
d Agui
l
ar
Documentatio
n
: Explain g
i
t-
m
ergetool's use of tempor
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David
A
guilar
M
a
kefile: Remove usage
o
f deprecated P
y
th
o
n "has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
avid A
g
uil
a
r
diffto
o
l: Fix
'--gui' when
d
iff
.
guito
o
l is u
n
config
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d
Ag
u
ilar
t7800-difftool
.
sh: Te
s
t mergeto
o
l
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Aguilar
difftool
:
Update copyright
n
otices to list eac
h
y
e
ar
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftoo
l
: U
s
e e
v
al
t
o expand '--ex
t
cmd' expres
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avi
d
Aguil
a
r
difftool: Add '-
x
' and
a
s a
n
al
i
as for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id
A
g
ui
l
ar
t
7800-di
f
ftool
.
sh: Sim
p
lify the -
-
ex
t
cmd te
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguila
r
git-d
i
f
f
.
txt:
Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Ag
u
ilar
difftool: All
o
w specifying u
n
c
onfig
u
red command
s
wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
dif
f
tool--helper: Remove use
o
f t
h
e GIT
_
M
E
R
G
E_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--help
e
r
:
Update
co
p
y
righ
t
and remove distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
git-difftool
:
A
d
d
'
-
-gui' for selectin
g
a GUI
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
t78
0
0-difftool: S
e
t
a
bogus tool
f
or use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
a
v
id
A
guilar
help: Do not unne
c
essarily look
fo
r
a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
submodule
.
c: Squelch a "u
s
e before as
s
ignment"
w
arning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
diff: gen
e
rate pretty filename
s
in pr
e
p_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id
A
guilar
compat: a
d
d a basename() compat
i
bility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
A
guila
r
c
o
m
p
a
t:
add a mks
t
e
m
p
s() compatibilit
y
functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-replac
e
to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
Aguilar
merg
e
tool--lib:
a
dd support for a
r
axis m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Aguilar
mergeto
o
l--l
i
b: specializ
e
diff
option
s
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David A
g
uilar
mer
g
etoo
l
-
-lib: simplify API usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difft
o
ol/mergetool:
r
efactor
c
ommands to
use g
i
t-merge
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergeto
o
l: use
$
(
.
.
.
) ins
t
ead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash c
o
mp
l
etion
:
add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
i
lar
difftoo
l
: add support for a difftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Ag
u
ilar
diff
t
oo
l
:
a
dd various git-
d
i
fft
o
o
l
t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
i
lar
d
if
f
t
o
ol: move
'
git-d
i
fftool' out
of c
o
nt
r
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: add
a
-
y
shortcut
f
or --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
ila
r
di
f
f
t
ool: use per
l
built-
i
ns wh
e
n
testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
di
f
ft
o
ol: remove
the backup fi
l
e
f
eature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
diff
t
ool: remove merge options for o
p
e
n
diff, t
k
diff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
v
id Aguilar
everyday:
u
s
e
the da
s
hless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguil
a
r
contrib/dif
f
tool: use a separate con
f
ig n
a
mespac
e
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Agu
i
lar
con
t
rib/difftool: Don't rep
e
at merge
t
o
ol candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
to
o
l:
p
ut t
h
e cursor on the editable file fo
r
Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difft
o
ol: fix documentati
o
n p
r
oblems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
a
v
id Aguil
a
r
contrib:
ad
d
'git difftool' for launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
i
lar
git-m
e
rgeto
o
l:
p
r
o
per
l
y handle "git mergetool -- filenam
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguil
a
r
t
e
st
s
:
a
dd
a testcase for
"
git submodule sy
n
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Agu
i
l
a
r
git-s
u
b
m
odu
l
e: replace duplic
a
ted c
o
de with a
module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
uilar
[PATCH] gitk: Don't show loca
l
ch
a
ng
e
s when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree