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: Check all return codes from compare()
2012-07-25
Da
v
i
d
Agui
l
a
r
d
i
fftool: Check all return
c
odes
from comp
a
re()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
difftool: H
a
ndle findi
n
g mergetools/ in a path wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difft
o
ol: Use syml
i
nks when dif
f
ing again
s
t th
e
worktre
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool:
Cal
l
t
h
e temp directory "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
Aguila
r
difftool: Move
o
pti
o
n values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid A
g
uilar
difftool: Elimin
a
te glo
b
al
v
ariable
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
guilar
di
f
ftool: Simpli
f
y prin
t
_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Aguil
a
r
t7800:
T
est
d
i
f
ftool
p
a
s
sing
a
rgume
n
ts
t
o diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
A
gu
i
lar
mergetool:
P
ro
v
ide
an empty
f
ile whe
n
ne
e
ded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
Aguilar
Makefile:
I
mp
r
ov
e
compi
l
e
r
he
a
d
er
dependency ch
e
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
merge
t
ool
s
/
m
eld: Use '--ou
t
put' w
h
en ava
i
lable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--li
b
:
Refactor
tools into
separ
a
te fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetoo
l
--lib: Make
style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
A
guilar
di
f
ftool-
-
helper: Make s
t
yle co
n
sist
e
nt
w
i
th git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Aguila
r
t/t7503-pre
-
commit-
h
ook
.
sh: Ad
d
GIT_PREFIX
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git
-
mergetool--lib: Make vimdiff r
e
tain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t: Remo
v
e
handling for GIT_P
R
EFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
se
t
up:
P
rovide
GIT
_
PREFI
X
t
o
bui
l
t-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id Aguilar
sub
m
odule sync: Update "submodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
ergetool: Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguilar
D
o
cumentation: Explain git-merget
o
ol's use
o
f temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
Makefile: Remove usage of deprecated Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
difftool: F
i
x '--gui
'
when dif
f
.
guitool is unc
o
nfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid
Agui
l
ar
t78
0
0-d
i
ffto
o
l
.
sh: Test mergetool
.
pro
m
pt f
a
llback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Aguilar
difftoo
l
: Update copyrig
h
t notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool
:
Use eval t
o
exp
a
nd
'--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
diffto
o
l: Ad
d
'-x' and as an a
l
ias for '-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
t7800-difftool
.
s
h
:
S
implify t
h
e
-
-
extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Ag
u
ilar
git-diff
.
txt: L
i
nk to
git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Agu
i
lar
difftool: A
l
low spec
i
fyin
g
unconfigur
e
d comman
d
s with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l--helper:
R
e
move use of the GIT_ME
R
G
E_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Agu
i
l
ar
difftool--
h
elper: Upd
a
te c
o
pyright an
d
re
m
ove di
s
tra
c
ting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difft
o
ol: Add '--gui
'
for sele
c
t
i
ng a
G
U
I tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid
A
guila
r
t
7
800-difftool: Set a b
o
g
u
s
t
ool
f
or use b
y
test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
g
u
ilar
he
l
p
:
D
o
not unn
e
c
e
ssarily look fo
r
a
r
e
pository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch a "use
b
efore assignm
e
n
t
" w
a
rning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
diff: generate pretty filena
m
e
s
in prep_temp_bl
o
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
compat: add
a
bas
e
name() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkstemps() comp
a
tibil
i
ty func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Ag
u
il
a
r
Add git
-
repla
c
e to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guilar
m
e
rgetool
-
-lib: add su
p
port for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Ag
u
ilar
m
ergetool--lib: s
p
ecialize diff opt
i
ons
for
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool
-
-lib: simpli
f
y
API usage by removi
n
g
m
or
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifft
o
ol
/
merg
e
too
l
: refactor
comman
d
s to
use
g
it-
m
er
g
eto
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mer
g
e
t
ool: use $(
.
.
.
) i
n
s
t
ead of
`
b
a
ck
t
icks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
b
a
sh compl
e
ti
o
n: ad
d
gi
t
-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agu
i
lar
difftool:
a
d
d
support for a difftool
.
pro
m
pt co
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: add various git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
f
ftool: move 'git-difftool' out of c
o
ntri
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
difftool: a
d
d
a
-y shortcut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: use perl built-ins wh
e
n
t
e
sting for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftoo
l
: re
m
ove th
e
back
u
p
fi
l
e
fe
a
tu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
difftool: re
m
ove mer
g
e option
s
for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
i
d
Agui
l
ar
ever
y
da
y
: us
e
t
he dashless f
o
r
m
of
git-
i
nit
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difftool: use
a separate config namespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contri
b
/difftool
:
Don't repeat merge tool candidat
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguila
r
d
i
fftool
:
put the cursor o
n
the
edit
a
ble file
f
or Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
di
f
ftool: fix
d
ocumentation p
r
o
b
lems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguil
a
r
c
on
t
rib: add 'git difftool' for launchin
g
c
ommon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-
m
ergetool:
p
r
o
p
e
r
ly
handle "git mergeto
o
l -
-
filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a
t
estcase for "git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguila
r
git-submo
d
ule: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
A
g
u
i
lar
git-submodule: replace dup
l
icated code with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
avid Aguilar
[PATCH] gitk
:
Don't show lo
c
al changes when w
e
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree