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
Merge branch 'dg/run-command-child-cleanup' into maint
2012-09-09
D
a
v
i
d Aguilar
gitk: Rename
'tagconten
t
s
' to 'cache
d
_ta
g
con
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
lar
gitk: Teac
h
"Reread ref
e
renc
e
s
"
to
r
el
o
ad
t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
Aguila
r
t7
8
00:
T
e
st
d
ifftool passing a
r
g
ume
n
ts t
o
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d Aguil
a
r
merget
o
o
l: Pro
v
ide an emp
t
y
file whe
n
nee
d
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Ag
u
ilar
M
a
kefile: Improve
c
ompil
e
r header dependency chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
A
g
u
ilar
merg
e
tools
/
meld
:
Use '--output' whe
n
a
vailable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Ag
u
ilar
m
e
rge
t
o
ol--li
b
: Refactor tools
i
nto
s
eparate
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Agui
l
ar
merge
t
ool--li
b
: Make
s
tyle consis
t
ent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--h
e
lpe
r
: Make style co
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pr
e
-commit-hook
.
sh: Add GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-merget
o
ol--lib: Mak
e
vimdif
f
re
t
ain
t
he cu
r
re
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
A
guilar
g
i
t
: Remove
h
andling
f
or
G
IT_
P
REFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
setu
p
: Provide GIT_PREFIX to
b
u
i
lt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule s
y
n
c: Update "sub
m
o
d
ule
.
<nam
e
>
.
ur
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agui
l
ar
mergeto
o
l
:
S
kip aut
o
r
e
sol
v
ed paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
i
l
ar
D
o
cumen
t
at
i
on: Explain git-m
e
rgetoo
l
's us
e
of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makef
i
l
e
: R
e
m
o
ve usage of deprecated P
y
t
h
on "has_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d Agu
i
lar
d
if
f
t
o
ol: Fix '--gu
i
'
w
h
en diff
.
guito
o
l
is unc
o
nfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-dif
f
tool
.
sh:
T
e
s
t mergeto
o
l
.
p
rompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguilar
difftool: Updat
e
copyright no
t
ices t
o
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
A
guilar
difft
o
o
l: Use eval t
o
expand '--extcmd' e
x
pressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
diffto
o
l: Add '-x' an
d
as an
alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
a
r
t7800-difftool
.
sh: Si
m
plify the
--e
x
t
c
md test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
git-diff
.
t
x
t:
L
ink to
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
A
g
u
i
lar
difftoo
l
:
A
ll
o
w
s
pecifying u
n
configured com
m
ands
w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avi
d
Agui
l
ar
difftool--helper: Remove
us
e
of t
h
e G
I
T_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
uilar
di
f
ftool--h
e
lper:
U
pdate copyright and re
m
ove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
g
it-dif
f
t
o
o
l:
Add '--gui' for
select
i
ng a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difftool: Set a bog
u
s tool for use
b
y tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
ar
h
e
lp: Do
not unn
e
c
essarily
lo
o
k for a reposit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
A
guilar
s
ubmodule
.
c: Squelch a "use before assignment
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agui
l
ar
d
iff
:
generate pretty filenames i
n
pr
e
p_temp_blo
b
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
A
g
uilar
compat: a
d
d
a
basen
a
me() compatibil
i
ty functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
compat: add a
m
kstemps(
)
compati
b
il
i
t
y functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
Add git-r
e
place to
.
giti
g
nor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool
-
-
lib: add supp
o
rt for ara
x
is mer
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergetool--li
b
: spe
c
ialize di
f
f options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
m
er
g
eto
o
l--lib:
s
i
mplify API usage b
y
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difft
o
o
l/mergetoo
l
: refacto
r
comma
n
d
s to use git-merge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
m
ergetool:
use $(
.
.
.
) instead of `ba
c
ktic
k
s`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bash completio
n
: ad
d
git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add support f
o
r
a
difftool
.
prompt conf
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
ila
r
d
if
f
tool
:
add various git-difftool
t
es
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
move '
g
it-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guilar
dif
f
tool: add a -y shortcut for --no
-
pro
m
pt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agui
l
ar
difftool: use perl built-ins wh
e
n testing
f
o
r
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: rem
o
ve the backup fil
e
fea
t
ur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
d
ifftool
:
remove merge o
p
t
i
ons for opendi
f
f, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
A
guilar
every
d
a
y: use
the
da
s
hle
s
s form o
f
g
i
t-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Agui
l
ar
contrib/
d
ifftool: use a separa
t
e
co
n
f
ig nam
e
s
p
a
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Aguilar
contrib
/
difftool:
D
o
n
'
t repeat m
e
rge tool candid
a
tes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ftool: p
u
t
t
he
c
urs
o
r on t
h
e edi
t
able file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
fftool
:
fi
x
documen
t
ation
problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Aguilar
co
n
t
ri
b
: add 'gi
t
difftool' for
l
aunc
h
ing common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: pro
p
erly han
d
l
e
"git
mergetool
-
- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Ag
u
ilar
test
s
: add a testc
a
se fo
r
"git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguila
r
git-sub
m
odule: add "sync
"
com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid A
g
u
i
lar
git
-
s
u
bmodul
e
: repla
c
e
d
uplicated
code wit
h
a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David A
g
u
i
lar
[
PATCH]
g
i
tk: Don'
t
show local changes whe
n
w
e
there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree