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
mergetool--lib: improve the help text in guess_merge_tool()
2013-01-29
David Agui
l
ar
merge
t
ool--li
b
:
improve t
h
e help text in guess_m
e
rge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Agu
i
lar
mer
g
eto
o
l-
-
lib
:
simplify command expre
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
m
e
rgetool
s
: s
i
mplify how we handle "vi
m
" and "
d
efaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid A
g
uilar
merg
e
to
o
l--li
b
: improve s
h
ow
_
tool_help() o
u
tput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
ui
l
ar
m
e
r
g
etools/vim: remo
v
e
redu
n
dant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: Allow custom co
m
mands to o
v
e
rride built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
i
l
a
r
g
i
tk
:
Rename 't
a
gcontents' to 'cached_ta
g
conten
t
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
Aguilar
gitk: Teach "Re
r
ea
d
references" to
r
eload tag
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguil
a
r
mergetool,difftool: Document --
t
ool-hel
p
consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
d
i
f
ftool: Disable --sym
l
inks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
d
ifftool: Handle compare() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
i
d Aguilar
di
f
ftool: Wrap
l
ong
l
ines for readabilit
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
lar
difftool: C
h
eck all r
e
turn co
d
es from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
il
a
r
d
ifftoo
l
:
H
and
l
e finding
me
r
getools/
in a path w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
i
fftool:
U
se
s
y
mlinks when
d
iffing against
the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguil
a
r
diff
t
o
ol:
C
all the t
e
mp directory "g
i
t-di
f
ftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
g
ui
l
a
r
difftool: Move opti
o
n
v
alues in
t
o a h
a
sh
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminate g
l
obal
v
ar
i
abl
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Agu
i
lar
d
iffto
o
l: Si
m
plif
y
print_to
o
l
_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Aguil
a
r
t7800: Test diff
t
o
o
l passing argu
m
ent
s
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
merg
e
tool
:
Provide
an e
m
pty file when need
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Im
p
ro
v
e c
o
m
p
iler header
d
ependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
me
r
getools/meld:
Use '--
o
ut
p
ut' when avail
a
ble
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Ag
u
ilar
mergetool--lib: Refa
c
tor tools i
n
to separate fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
id Agu
i
lar
mergetool
-
-l
i
b: Make style cons
i
s
t
ent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
difft
o
ol--helper
:
Make sty
l
e c
o
nsistent
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t75
0
3-pre-commit-hoo
k
.
sh:
A
dd
G
I
T_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
it-mergetool--lib: Make vi
m
diff retain
the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
git: Rem
o
ve handling for GI
T
_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
s
e
t
u
p
: P
r
ovide GIT_PREFIX to bui
l
t-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodul
e
sync: Update "
s
u
bmodule
.
<
n
a
m
e
>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
A
guilar
me
r
geto
o
l: Skip autoreso
l
ved pat
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
Docum
e
n
tat
i
on: E
x
plain git
-
m
e
r
geto
o
l
'
s use of tempor
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
i
d
Aguilar
M
a
kefile:
R
emove u
s
age of dep
r
eca
t
ed Python "h
a
s_
k
ey
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Agui
l
ar
difftool: Fix '--g
u
i' when
d
iff
.
gui
t
o
ol i
s
unconfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
Aguilar
t7800-difftool
.
s
h
: T
e
st me
r
getool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
u
ilar
difftool:
Update cop
y
right not
i
ces to lis
t
eac
h
ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid
A
guilar
difftool: Use eval to expand '--ex
t
cmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
diffto
o
l: Add '-x' and as an alias
f
o
r
'--extc
m
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t78
0
0-
d
ifft
o
o
l
.
sh: Simpl
i
fy the
--extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
git-
d
iff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
di
f
ft
o
ol: A
l
l
ow specifying un
c
onfigured c
o
m
m
ands wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol
-
-he
l
per:
Remove
u
se of t
h
e GIT_MERGE_
T
O
OL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d Agu
i
lar
d
i
f
f
t
ool--helper: Update copy
r
ight and remove dis
t
rac
t
ing
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
g
i
t-difftool:
A
dd '--gui' for
s
e
l
ecting a GUI too
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t
7800-difftool: 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 not unneces
s
a
rily look for a reposito
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch a "use befo
r
e assignm
e
nt" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Aguilar
di
f
f
: g
e
nerat
e
pretty filenames in prep_temp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat: ad
d
a b
a
sename
(
)
compatibility
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
l
a
r
c
o
m
pat:
ad
d
a mkstemps(
)
compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
A
d
d git
-
replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Ag
u
ilar
me
r
ge
t
ool
-
-lib: add
s
upport f
o
r araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Ag
u
ilar
mergetool--
l
ib: specialize
d
i
ff options
f
or emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d Agu
i
lar
mergetool--lib
:
simplif
y
AP
I
usa
g
e by removing
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l/merge
t
ool: ref
a
ctor commands to use git-m
e
r
getool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agui
l
ar
me
r
getool: use
$(
.
.
.
) ins
t
ead of `b
a
c
k
t
i
cks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
ba
s
h completion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
d
i
ff
t
ool: add
s
u
p
port for a difftoo
l
.
prompt
c
onfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
ftool: a
d
d vari
o
us gi
t
-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
fftool: mov
e
'git-
d
ifftoo
l
' ou
t
of contr
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
i
l
ar
difftool: a
d
d a -y s
h
or
t
cut for --no-pro
m
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l
: use perl b
u
ilt-ins when testing fo
r
m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
d
ifftool: remove the backup file featu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diff
t
o
o
l:
remove m
e
rge options for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday
:
use the dash
l
ess form of
git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Ag
u
ilar
contrib/d
i
fftool: use a separate
co
n
fig
n
amespace
f
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
uilar
contrib/diff
t
ool: Don't repeat merge
t
o
ol candidat
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uila
r
dif
f
tool: put
t
he curso
r
o
n
th
e
editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
d
i
fftoo
l
:
fix docume
n
tation pro
b
lems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
A
guil
a
r
contrib: add 'g
i
t difftoo
l
' fo
r
launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetoo
l
:
properly
handle
"git mergetool -- f
i
lename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests:
a
dd
a
t
e
s
tcase for "git submo
d
u
le
s
ync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Davi
d
A
guila
r
git-submodule: add
"
sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-s
u
bmodu
l
e: replace d
u
plicated cod
e
w
i
th a modu
l
e_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David
Agu
i
lar
[
P
ATCH] gitk: Don't show lo
c
al changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree