repo.or.cz
/
git
/
mjg.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
Aguil
a
r
difftool: Handle compa
r
e() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftool: Wrap long
line
s
for rea
d
ability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check a
l
l return
c
o
des fro
m
compa
r
e
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
a
r
di
f
ftool: H
a
ndle finding m
e
rge
t
ool
s
/
in a p
a
th
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool: Use
s
yml
i
nks when diff
i
ng a
g
ain
s
t the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
diffto
o
l
: C
a
ll
t
h
e
te
m
p dire
c
t
ory "git-difftoo
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
diffto
o
l: Move
op
t
ion
va
l
ues into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difft
o
ol: Eliminate global va
r
iables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
dif
f
t
o
ol: Si
m
plify print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800:
T
es
t
difftool pa
s
sing argum
e
nts
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
Aguila
r
m
e
r
getool: Provide an e
m
pty file when ne
e
ded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
Aguilar
Makefile: Improve
compil
e
r header dependen
c
y check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
mergetools/meld: Us
e
'--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
mergetool--li
b
: Re
f
actor tools int
o
separate file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
m
e
rg
e
tool--
l
ib: Make style consist
e
nt wit
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agu
i
lar
difft
o
o
l--hel
p
er: Mak
e
style consisten
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
avid
A
g
u
ilar
t/t7503-pre
-
c
ommit-hook
.
sh: Add GIT_PREF
I
X
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
git
-
mergetool--li
b
: Make
v
imd
i
f
f
reta
i
n the
c
urrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
git:
R
emove handling
f
or GIT_PR
E
FIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguil
a
r
setup: Provide GI
T
_
PRE
F
IX to buil
t
-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
i
d
Aguilar
su
b
module sync:
U
pdate "submodule
.
<
name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Agu
i
lar
merg
e
tool: S
k
ip autoresolved pat
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Doc
u
m
e
n
t
ation: Ex
p
l
ain git-mergetool's use o
f
tempo
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d
Agui
l
a
r
Makef
i
le
:
Remo
v
e usage of
deprec
a
ted Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Agui
l
a
r
difftool: Fix
'--gu
i
' when diff
.
guit
o
ol
is
u
n
c
onfigur
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7
8
0
0-difftool
.
sh: Test mergetool
.
promp
t
f
allba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguil
a
r
difftool:
Up
d
a
t
e copyright n
o
t
i
ces to list ea
c
h yea
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
di
f
f
t
ool: U
s
e eval to expa
n
d
'
-
-
extcm
d
' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
diffto
o
l
:
Add '-x' and as an alias f
o
r '--ext
c
m
d'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
t78
0
0-dif
f
tool
.
s
h:
Simplif
y
the --extcmd
t
e
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
t
x
t: Link to g
i
t-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow sp
e
c
ifying unconfigured com
m
ands
wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
di
f
ftool--helper: Re
m
ove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
dif
f
tool--helper: Updat
e
cop
y
righ
t
and re
m
ove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
Agu
i
lar
git-difftool:
Ad
d
'--gui' for selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t78
0
0-difftool: Set a bogu
s
to
o
l
f
or use by t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
hel
p
: Do not unnece
s
sa
r
il
y
look for a reposi
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
avid Aguila
r
s
ubmodule
.
c
:
Squelch
a
"
use before
a
ssignment"
w
arning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: generat
e
prett
y
filen
a
m
es in prep_t
e
mp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
comp
a
t: add a basename() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
m
p
a
t: add a mkstemps() co
m
patibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Agu
i
lar
A
d
d
git-
r
e
p
l
ace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
v
i
d Aguilar
merge
t
ool--lib: a
d
d support for araxis m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Ag
u
ilar
m
e
rgetool--lib:
spec
i
alize
d
i
f
f
options fo
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergeto
o
l--lib: simplify API usage by remo
v
ing m
o
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
ifftool/merge
t
ool:
refactor com
m
and
s
to
u
se git-
m
ergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
a
r
mergetool: use $(
.
.
.
) inste
a
d of `b
a
c
kticks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
bash completion: add
g
it-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d
A
guilar
diff
t
ool: add
s
upport
for
a
difftool
.
prompt c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fft
o
ol: add vari
o
us
git-
d
iffto
o
l tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
d
i
fftool: mo
v
e 'g
i
t-di
f
f
tool' o
u
t of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
i
lar
difftool: add a -y short
c
u
t fo
r
--n
o
-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
tool: u
s
e
perl bui
l
t-ins when testing
for
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d
A
guilar
d
i
f
f
too
l
: remove the b
a
ckup
file
featur
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Ag
u
ilar
difftool:
remove merge options
f
o
r opend
i
ff,
t
kdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Agu
i
lar
every
d
ay: u
s
e t
h
e dash
l
ess for
m
of git-i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
contrib/difftool:
use a separ
a
te config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difftool:
Don't re
p
eat merge
tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid
A
g
u
ilar
difftool: pu
t
the cursor on
t
he edi
t
able file
f
or Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguilar
difftool:
fi
x
docume
n
ta
t
i
on problem
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Dav
i
d Agu
i
lar
contrib: add 'git diff
t
ool' for lau
n
ching c
o
mmon mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: prop
e
rly hand
l
e "git
merg
e
tool
-- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
l
a
r
te
s
ts: add
a tes
t
case for
"
git submo
d
ule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguilar
git-sub
m
odule:
add "syn
c
" comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David A
g
uilar
git-submodule: replace du
p
lic
a
ted code with
a
module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
uilar
[PAT
C
H] git
k
:
D
o
n
't show local changes when we
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree