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
mergetool--lib: Allow custom commands to override built-ins
2012-09-25
David Aguilar
merget
o
ol--lib: All
o
w custom commands to overr
i
de built-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
A
g
u
ilar
t7800: Test difftool passing arguments
to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mer
g
etool: Provide
a
n empty file when
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Make
f
ile: Improve compi
l
er he
a
der dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/meld: Use '--output'
w
h
e
n
available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
merg
e
too
l
-
-
l
ib: Refactor tools into separat
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetool
-
-lib: Make
s
tyl
e
con
s
ist
e
nt w
i
th git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
u
i
l
ar
diff
t
ool--helper: Make style consis
t
en
t
with gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/
t
7503-pre-comm
i
t-
h
o
ok
.
s
h
: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
git-mergetool--lib: Make vimdiff
r
etain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
git: Remove handling
for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
set
u
p: P
r
ovide GIT_PREFIX t
o
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
av
i
d
A
guilar
s
ubmodule
s
y
nc
:
Update "submodu
l
e
.
<na
m
e>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Ag
u
ilar
me
r
get
o
ol: Skip
autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
av
i
d A
g
uila
r
Documen
t
ation: Explain git-mergetool's use of t
e
mpo
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Aguilar
Makefile: Remove usage o
f
d
eprecated Py
t
h
o
n "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d
A
guilar
difftoo
l
:
F
i
x
'
--gui' when d
i
ff
.
guitool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800
-
d
i
fftool
.
sh: Test mergetool
.
prompt
f
allb
a
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update copy
r
ight notices
t
o
l
ist ea
c
h year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
d
ifftool:
U
se eval to expand '--extcmd
'
expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add '-x' a
n
d a
s
an alias
f
or '
-
-ext
c
md'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
sh: S
i
mp
l
ify the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
git-
d
iff
.
tx
t
: Li
n
k to g
i
t
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
difftool: All
o
w specifying u
n
configured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
gui
l
ar
difftool--helper:
Rem
o
ve use of the GIT_
M
ERGE_T
O
OL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
difftool--helper: Update copyr
i
ght and re
m
ove
d
i
stracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
i
d
A
g
uilar
git-difftool: Add
'
--gui'
f
or selecting a GUI to
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
t
7800-di
f
ft
o
ol: Set a bogus
tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
help: Do not u
n
necess
a
rily look f
o
r a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
submodule
.
c:
Squelch a "use before assignmen
t
" warni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
diff: genera
t
e pretty
fi
l
enames in prep_temp_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a bas
e
name()
compa
t
ibi
l
ity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompa
t
: add a mkstemps() compati
b
ility
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Ag
u
ilar
Add git
-
rep
l
ace to
.
giti
g
n
or
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
i
lar
mergetool--lib:
a
dd support fo
r
araxi
s
m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Agui
l
ar
mergetool--l
i
b: s
p
e
c
ia
l
ize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: simplify API usage
b
y removin
g
mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool/mergetool
:
r
e
fact
o
r c
o
mm
a
nds to use g
i
t-mergeto
o
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
m
e
r
getool: use $(
.
.
.
) inst
e
ad of `b
a
ckt
i
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
bash completion: a
d
d git-difftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
o
l
: add
s
upp
o
rt for
a di
f
ft
o
ol
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
o
l
: ad
d
various git
-
difft
o
ol tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
diff
t
ool: move 'git-di
f
ftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gui
l
ar
d
i
fftool: add a -y shortcut for
--no-p
r
ompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: u
s
e perl built-ins w
h
en testi
n
g for
msy
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguil
a
r
difftool: remove the
b
ackup file fe
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: remo
v
e merge options for opendiff, tkdif
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguila
r
e
v
eryday: use the dashless fo
r
m
of git-i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguila
r
contrib/
d
iff
t
ool: use a separate co
n
fig
n
amespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id A
g
uilar
contrib/d
i
fftoo
l
: Don't re
p
eat merge to
o
l ca
n
d
i
d
ates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
iff
t
ool: put t
h
e
cursor on
t
he editable file f
o
r Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: fix documentati
o
n problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contri
b
: add 'git difftoo
l
' for launching co
m
mo
n
mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Aguilar
git-mergetool: properly handle "g
i
t mergetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests:
ad
d
a te
s
tcas
e
for "git s
u
b
mo
d
ule
s
y
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule: add "
s
ync
"
comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguilar
g
i
t
-subm
o
dule: re
p
lace d
u
plic
a
ted code with a module_
l
ist
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid
A
g
u
ilar
[PATCH] gitk:
D
on
'
t show local ch
a
nges when
w
e there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree