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
t7800: "defaults" is no longer a builtin tool name
2013-02-21
D
a
v
i
d Aguilar
t7800: "de
f
aults" is no longer a builtin tool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Agu
i
lar
t
7
800: modern
i
ze tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Ag
u
ilar
t7
8
00: updat
e
copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d Ag
u
ilar
dif
f
tool: silence uninitialized
v
a
ria
b
l
e
w
a
r
n
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
il
a
r
p4me
r
g
e: fix pr
i
ntf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool-
-
helper: fix print
f
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Aguilar
do
c
: gener
a
te a list of valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
mergetool--l
i
b: add func
t
i
o
ns for findi
n
g av
a
il
a
b
l
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rgeto
o
l--lib: improve the help tex
t
i
n gues
s
_merg
e
_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
r
getool--lib
:
s
implify command expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
avid
Aguilar
merget
o
o
ls:
s
i
m
p
l
i
fy ho
w
we h
a
n
d
le "vim" and
"defaul
t
s
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
mergetool--lib: improv
e
show_too
l
_h
e
lp()
o
ut
p
ut
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid A
g
uilar
m
e
rgetools/vim: remove redund
a
nt
di
f
f
c
o
mmand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id Agu
i
lar
me
r
ge
t
o
o
ls/p4merge: H
o
no
r
$TMPDIR f
o
r the /dev/
n
ull
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
me
r
g
etools
/
p4merge: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
mergetool--lib: Allow custom comman
d
s to
over
r
ide b
u
ilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: R
e
name 'tagc
o
nte
n
ts' to 'cach
e
d_ta
g
con
t
ent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk:
T
eac
h
"Reread references" to r
e
load t
a
g
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
avid A
g
uilar
merget
o
ol,difftoo
l
: Doc
u
ment --tool-
h
elp
c
onsiste
n
tly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguil
a
r
d
i
fftool: D
i
sable
-
-
symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
ifft
o
ol
:
Handl
e
c
o
m
p
are() r
e
turning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d
A
guilar
d
ifftool: Wrap long lines
f
or readabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
ifftool: Chec
k
all return c
o
des from compare
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handle finding
m
erge
t
ool
s
/
in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
diff
t
o
o
l: Use symli
n
ks
w
hen
diffing
against the work
t
r
e
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: Call the
temp directory "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
Aguilar
difftool: Mov
e
option
valu
e
s
i
n
t
o a h
a
sh
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
d
i
fftool: Elimin
a
te global v
a
riables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftoo
l
: Simplify print
_
t
o
o
l
_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t78
0
0: Test difftool
p
assin
g
ar
g
uments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
merg
e
too
l
:
Pro
v
ide an
e
mpty file
w
hen needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Improve compiler h
e
ader d
e
p
e
n
denc
y
che
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
m
ergetools/
m
eld:
Use '--output' when
a
vailable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguila
r
mergetool
-
-lib: Refac
t
or tool
s
into
s
eparate
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
A
g
u
i
lar
mergetool--
l
ib:
M
ake style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
difftool--helper: Make
s
tyle consist
e
nt with
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
a
vid Agui
l
ar
t
/
t75
0
3-pre-commit
-
h
o
ok
.
sh: Add GIT_PREF
I
X te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
git-merge
t
ool--lib: Make vimdiff retain
t
he c
u
rrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
git: Remove handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
setu
p
: Provide GIT_PREF
I
X to bu
i
l
t
-
i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Ag
u
i
lar
submodule s
y
nc: Up
d
ate
"sub
m
o
d
ule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip autoreso
l
v
ed p
a
ths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Documentation: Exp
l
a
in git-me
r
getoo
l
'
s use of
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d
Aguilar
M
akefi
l
e: Remove
usage of
d
eprecated Pyt
h
on
"
has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguil
a
r
diffto
o
l:
Fix '--gui' w
h
en diff
.
guitool is unc
o
nfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
s
h:
Test mergetool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Upd
a
te copyrig
h
t notice
s
t
o list each ye
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool: Use eval to
e
xpand '--ext
c
md'
ex
p
ressi
o
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difft
o
ol: Add '-x' and as
a
n alias f
o
r
'--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Agu
i
l
ar
t78
0
0-difft
o
ol
.
sh: Sim
p
l
ify the --
e
xtcm
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
git-diff
.
tx
t
: L
i
nk to git-diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
d
iff
t
oo
l
: Allo
w
specifyin
g
unconfi
g
ured co
m
mands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id
Ag
u
ilar
di
f
ftool--h
e
lper:
R
emove use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d
Aguil
a
r
difftool--helper: Upda
t
e copyr
i
ght and remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git
-
diff
t
o
o
l
: Add '-
-
gu
i
' for s
e
lec
t
ing
a
G
U
I tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-di
f
ftool:
S
et a bogus t
o
ol for u
s
e by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agu
i
l
ar
h
e
lp: D
o
not u
n
n
ecessa
r
ily
l
ook for a r
e
posito
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David
A
g
u
i
l
ar
sub
m
odule
.
c
: Squelch a
"
use
befor
e
assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: generate pretty filenames
i
n
p
rep_
t
emp_bl
o
b()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompat:
a
dd a
b
asename() compatibi
l
ity functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Agui
l
ar
compat: ad
d
a m
k
stemps()
c
ompatibility fu
n
ction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guila
r
Add g
i
t-replace to
.
git
i
gnore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
gu
i
lar
mer
g
e
t
o
ol--lib: add suppo
r
t for arax
i
s me
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Aguila
r
mergetool--
l
ib: sp
e
ci
a
lize diff op
t
ions fo
r
em
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid Agu
i
lar
merge
t
o
o
l-
-
lib
:
sim
p
lify AP
I
usage
by removing m
o
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Aguilar
diff
t
ool/mergeto
o
l: refactor commands to use g
i
t-mer
g
e
t
ool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uil
a
r
m
ergeto
o
l: use $(
.
.
.
) instead of
`backtick
s
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
bash comp
l
e
t
ion
:
add git-difft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
difftool
:
add support for a diffto
o
l
.
p
romp
t
c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftoo
l
: add various git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difft
o
ol: move 'git-diff
t
ool' o
u
t of
contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
ilar
difftool: add
a
-y shortcut for
-
-no-promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool:
u
s
e
perl built-ins when testi
n
g
for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
dif
f
tool: r
e
move th
e
backup
f
ile feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: remove merg
e
opti
o
ns fo
r
opendif
f
,
t
kdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David
A
guilar
e
veryday: us
e
the dash
l
es
s
f
or
m
of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
c
o
ntrib/difftool: use a separate
c
on
f
ig namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguil
a
r
contrib/
d
i
f
f
t
ool: Don't repeat merge tool candid
a
tes
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agui
l
ar
diff
t
ool:
put the
c
u
rsor on the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agui
l
ar
d
iff
t
ool: fix do
c
u
mentation pro
b
lems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David A
g
ui
l
ar
contri
b
: add 'git diff
t
o
ol' for launching com
m
on merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguila
r
git-mergetool: properly handle "g
i
t me
r
g
etool -- fil
e
nam
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a test
c
ase for
"
g
i
t
submodu
l
e
sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git-subm
o
dule: a
d
d "
s
ync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid
Aguil
a
r
g
i
t-submodule: repl
a
ce duplicated
c
o
de with a module
_
list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Aguilar
[PATCH] gitk:
D
on'
t
show lo
c
al changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree