repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Handle compare() returning -1
2012-07-26
David Agui
l
a
r
di
f
ft
o
o
l
:
Handl
e
compare() returni
n
g -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id
A
g
uil
a
r
difftool: Wrap long lines for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguilar
difft
o
ol: Check all return codes from
compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid
Ag
u
ilar
difftool: Handle finding mergetools/ in
a path wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
A
guilar
di
f
ft
o
o
l
: U
s
e
symlinks
w
h
e
n
di
f
fing against
t
he worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Call
t
h
e
temp directo
r
y "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
i
f
f
t
o
o
l: Move o
p
tion values
into a
ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguil
a
r
dif
f
to
o
l:
E
l
iminate global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool: Simpli
f
y
print
_
t
ool_help
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Aguilar
t7800:
Tes
t
difftool p
a
ssi
n
g arguments to
diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguil
a
r
mergetool: Provide an empty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
A
guilar
Makefile: Im
p
rove
compiler
h
e
ader dependency
check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guil
a
r
mergetools/meld: Use
'
--outp
u
t' when availab
l
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--l
i
b: Refact
o
r tools into sepa
r
ate fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Make style co
n
sistent
w
it
h
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
dif
f
tool--helper: Make
s
tyle c
o
nsistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David
Aguilar
t/t7503-pr
e
-commit-hook
.
sh:
Add
GI
T
_P
R
EFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
git
-
mergetool--lib: Make vimdiff retain the cur
r
ent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
git: Remove handling
f
or GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Agu
i
la
r
setup: Provi
d
e GIT_
P
REFIX
t
o built-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
submodule sync: Updat
e
"submod
u
le
.
<na
m
e>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
merge
t
o
o
l: S
k
ip
a
utoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
v
id
A
g
uilar
Docu
m
entation
:
Explain gi
t
-mer
g
etool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id
A
guilar
Makefile: R
e
move usage of deprecated Python
"has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
diffto
o
l: Fix
'--gu
i
' when diff
.
guitool
is u
n
config
u
r
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7800-difftool
.
sh:
T
est merget
o
ol
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id A
g
uilar
d
ifftool: U
p
date copyright noti
c
e
s to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
di
f
ftool: Us
e
eval to expa
n
d '--
e
xtcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Agu
i
lar
difftool: Ad
d
'-x
'
and a
s
an alias for '--ext
c
md'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
t
78
0
0-dif
f
tool
.
sh: Simplify
the --extcmd tes
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
g
i
t-di
f
f
.
t
x
t: Li
n
k
t
o git-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol: Allow
s
pecifyi
n
g
unconfigured c
o
m
m
a
nds
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
diff
t
ool--h
e
lper:
Remove
u
s
e
o
f the GIT
_
MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
difftool--helper:
Up
d
ate cop
y
right a
n
d remov
e
d
i
stracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
git-difftool:
A
dd '--gui
'
f
o
r
selectin
g
a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difftool: Set a bogus to
o
l
for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Aguilar
help: Do
n
o
t
unnecessarily look
f
or a reposito
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
A
guilar
s
u
b
m
o
dule
.
c:
S
q
u
elch a "use before as
s
ignme
n
t" wa
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
di
f
f: generate
p
r
etty filename
s
in pre
p
_temp
_
b
lob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
compat:
a
dd a
basename()
c
ompatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pat
:
add
a
mkstemps() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
gu
i
lar
Add git-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merg
e
to
o
l
-
-
lib: add s
u
pport for araxis
m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Aguilar
m
e
rget
o
ol--lib:
speci
a
li
z
e diff option
s
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Ag
u
ila
r
mer
g
e
tool--lib
:
simplif
y
API usage by
r
emoving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool
/
mergetool
:
re
f
ac
t
or co
m
m
a
nds to use g
i
t-
m
ergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
mergetool: use
$(
.
.
.
) instead of
`
bac
k
t
icks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
bash com
p
letion: add git-
d
ifftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Agui
l
ar
d
i
fftool:
a
d
d support for
a diff
t
ool
.
prompt c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
g
u
i
l
a
r
d
ifftool
:
add various
git-difftool t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-dif
f
to
o
l
'
out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
gui
l
ar
diff
t
ool:
a
dd a
-
y
shor
t
cut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: use pe
r
l built-ins when
t
e
s
t
i
ng for m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool: remove
the
b
ackup file
f
eature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: re
m
ove merge opti
o
ns fo
r
op
e
n
diff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: us
e
the da
s
hless form o
f
git-ini
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avi
d
Aguilar
co
n
tri
b
/d
i
fftool: use a sepa
r
ate
conf
i
g namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Aguilar
c
ontrib/difftool
:
Don't repeat merge
t
ool ca
n
d
idates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ftool: put
t
he curso
r
on the editab
l
e
file
f
or V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
d
ifftool: f
i
x docum
e
nt
a
tion
p
roblems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David
Aguilar
contrib: add
'git
d
ifft
o
ol
'
for launc
h
ing com
m
o
n
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool
:
properl
y
handle "git mergetoo
l
-- f
i
l
en
a
me"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
A
guilar
tests: add a test
c
ase for "git
su
b
module
sy
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
avi
d
A
guilar
g
it-sub
m
odule: add
"sync" com
m
a
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David A
g
uilar
gi
t
-
s
ubmodule
:
r
eplace duplicated code
w
i
t
h a module_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
v
id Ag
u
ilar
[P
A
T
CH
]
gitk: Don't show loca
l
changes when we
t
here
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree