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
is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
2010-01-23
Davi
d
Aguilar
t
7
800-difftool
.
sh: Test mergetool
.
prompt fal
l
ba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguilar
difftoo
l
: Update copyright notice
s
to
l
ist eac
h
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
ifftool: Use
e
v
al to exp
a
nd '--ex
t
cmd
'
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
f
f
too
l
: Add
'
-x' and as an alias for
'--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t7
8
00-difftool
.
sh: Simplify t
h
e --extcmd tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
git
-
diff
.
txt: Link t
o
git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
ui
l
ar
di
f
ftool: Allo
w
specifying
u
nc
o
nfigured commands
w
ith
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
il
a
r
difftool--
h
elper:
R
emove use of the G
I
T_MERGE_TOO
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool--helper:
U
pdate
copyright a
n
d remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
g
i
t-dif
f
tool: Add '--
g
ui' for select
i
ng a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
t78
0
0-difftool: Set a
bogu
s
t
ool
for
u
se by
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d
A
guilar
help: Do no
t
unnecessarily look
f
or a repo
s
i
t
or
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d
Aguil
a
r
submo
d
ule
.
c
: Squel
c
h a "
u
s
e
before assignment
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff:
g
enerate pretty filenames in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat: a
d
d a basename() co
m
pa
t
ibility functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
compat: add a mkst
e
m
p
s() compa
t
ibili
t
y fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
av
i
d Aguilar
Add git-replace to
.
gi
t
i
g
nore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid
Aguilar
merg
e
tool--lib: add support
for a
r
axis
merg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avid
Aguilar
merg
e
tool--lib: specialize d
i
ff options
for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetoo
l
--lib: simplify A
P
I usage by
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
difftool/m
e
rgetoo
l
: r
e
factor commands to
u
s
e git-
m
ergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
mer
g
etoo
l
:
use
$(
.
.
.
)
i
nstead of `b
a
ckt
i
cks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
bash completion:
a
dd git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add s
u
pport for a difftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool: add various git
-
di
f
ftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool:
m
ove 'git-diffto
o
l' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
diffto
o
l: a
d
d a
-
y shortcut for
--no-promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Agu
i
lar
diff
t
ool: use perl built-in
s
when
tes
t
ing
f
or msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
lar
d
i
fftool
:
r
emove
t
he backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool:
r
e
m
o
v
e m
e
rge options for opendiff, tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid Aguilar
everyday:
u
se th
e
dashless fo
r
m of
g
it
-
init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Aguilar
contr
i
b
/
di
f
ftool: use a
s
eparate co
n
f
i
g namesp
a
ce
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
avi
d
Aguilar
cont
r
i
b
/difftoo
l
: Don't re
p
ea
t
m
e
rge tool
c
andidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Agu
i
lar
d
i
fftool: put the c
u
rsor
on the edi
t
able
fi
l
e
for
V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
i
d
Aguilar
difftool
:
fix
d
ocumen
t
ation
p
roblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id Aguil
a
r
contrib: add 'git di
f
ftool' for launc
h
ing common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git
-
mergetool
:
pro
p
e
rly handle "git me
r
ge
t
ool
-- fi
l
ename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
A
guilar
t
ests: add a
t
e
s
tcase
f
or "git su
b
module
s
ync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id
A
gui
l
ar
g
it-submod
u
le:
add "sync"
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Aguilar
git-submod
u
le: rep
l
ace duplicated
cod
e
w
i
th a mod
u
le_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gi
t
k: Don
'
t
s
how local c
h
anges when w
e
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree