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: Handle compare() returning -1
2012-07-26
David Aguilar
difftool: Ha
n
dle compare() ret
u
rning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
diffto
o
l: Wr
a
p
lon
g
lines
for rea
d
ability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
di
f
ftool: Check
a
ll r
e
turn codes from compare
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool:
Handle find
i
ng mergetools/
i
n a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
diffto
o
l: Use symlin
k
s when
d
iffing against t
h
e worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Agui
l
ar
diffto
o
l
: Call the temp directory "
g
it-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool:
Move op
t
i
o
n v
a
lues into
a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difft
o
ol
:
Elimi
n
ate glob
a
l
v
ariables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
av
i
d Aguilar
diff
t
o
o
l
:
S
impli
f
y
p
rin
t
_tool_hel
p
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
avid A
g
uilar
t7
8
00: Test difftool pa
s
sin
g
argu
m
e
nts to d
i
ff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mer
g
etool: Provide an empty file when n
e
eded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Make
f
i
le:
I
mpr
o
ve co
m
piler header dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
ergetools/meld: Use
'
--
o
utput
'
w
he
n
a
v
a
ilabl
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
ergetool--
l
ib: Refa
c
tor
t
o
ol
s
into separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
gui
l
ar
mergeto
o
l
--lib
:
M
ake s
t
yle c
o
nsisten
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
diff
t
ool--helper:
Make
sty
l
e consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David
A
gu
i
lar
t/t7503-pre-commit-hook
.
sh:
A
d
d
GI
T
_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-m
e
rgetool--l
i
b: Make vimdiff ret
a
i
n the
c
urrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Re
m
ove handli
n
g
for GIT_
P
REFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
set
u
p: Prov
i
de
G
IT_
P
R
EFIX
t
o
built-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submo
d
ule syn
c
: Update "submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguil
a
r
me
r
getool:
S
kip a
u
toresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d
A
guilar
Doc
u
m
e
nta
t
i
o
n: Exp
l
ain git-mergetool's use of
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makef
i
le:
R
emo
v
e 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 '-
-
g
u
i
' when di
f
f
.
guitool is
unconfigu
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t7800-
d
i
f
ftool
.
sh
:
Test merget
o
ol
.
prompt
fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid
Aguila
r
d
iff
t
ool: Upda
t
e
copyright n
o
tices to
l
i
st
each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use eval to ex
p
and '--ext
c
md' e
x
pressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avi
d
Aguilar
diff
t
ool:
Ad
d
'-x' an
d
as an alia
s
for
'--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t7800-
d
i
fftool
.
sh: Simplify the --ext
c
md te
s
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
git-dif
f
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
i
lar
difftool: Al
l
ow sp
e
cifyin
g
unconfi
g
ured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
ilar
difftoo
l
--helper: Remove use of
t
h
e
G
IT_MERG
E
_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Agu
i
lar
difftool-
-
h
el
p
er: Update copyright
a
nd remove distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
A
gu
i
la
r
git-di
f
ftool: Add '--gui' for
s
e
lect
i
ng a
GUI
t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
A
g
uil
a
r
t7800-
d
iffto
o
l: Set a bogus tool for
use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do n
o
t unn
e
cessa
r
ily look
f
o
r
a r
e
pository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
avid Aguilar
s
ub
m
odule
.
c:
S
quelch a "use befo
r
e assignme
n
t" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
u
ilar
diff: generate pretty filenames in prep_t
e
mp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: a
d
d
a
base
n
ame(
)
compatibility
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguila
r
compat:
add a mkstemps()
c
ompa
t
i
b
i
l
ity fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
gui
l
a
r
Add git-replace
to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
gu
i
lar
me
r
getool--lib: a
d
d
support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
u
i
lar
mergeto
o
l
-
-l
i
b: spe
c
ialize
di
f
f opt
i
ons for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: si
m
plify API usa
g
e
b
y remo
v
ing
m
ore
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
diff
t
ool/m
e
r
getool:
refac
t
or comman
d
s to use g
i
t-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merge
t
ool: use $(
.
.
.
)
instead of `backtic
k
s`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
i
lar
bash com
p
letion: add
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
diffto
o
l: add sup
p
or
t
for a difftool
.
p
rompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add va
r
i
ous git-difftool te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
diffto
o
l:
m
ove
'
git-difft
o
o
l' o
u
t of cont
r
ib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Ag
u
i
lar
difftool: add a -y s
h
ortcu
t
for --no-pro
m
pt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difft
o
o
l: use
p
erl built-
i
ns when testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
ilar
difftool: remove the backup file f
e
ature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
r
emove merge optio
n
s
for opendiff,
t
kd
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
uilar
everyday
:
u
se the
dash
l
e
s
s form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Agui
l
ar
co
n
t
rib/difft
o
ol: use a
s
e
p
arate config namespace fo
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guilar
contrib/difftoo
l
: Don't re
p
ea
t
me
r
ge too
l
candidate
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
i
d
A
g
uil
a
r
difftool: put
the curs
o
r
o
n
the edit
a
ble f
i
le
for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguilar
difftool: fix docu
m
entat
i
o
n
problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
av
i
d Aguilar
contrib: add 'gi
t
difftool' for l
a
un
c
h
i
ng common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
i
t
-merget
o
ol
:
p
r
operly handl
e
"git mergetool -- filename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id Aguil
a
r
t
ests: add a testcase for "git submodule
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Ag
u
ilar
git-submodule: add "syn
c
" com
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
Aguilar
git-submo
d
ule:
replace
d
uplicated code with a m
o
dule_
l
ist
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Dav
i
d Ag
u
ilar
[PATCH] gitk: Don't show loc
a
l
ch
a
nges wh
e
n we th
e
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree