repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Skip autoresolved paths
2010-08-17
David Aguil
a
r
m
e
rgetool: Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
i
d
Aguilar
Documentati
o
n
: Explain gi
t
-me
r
getool's use
of
tem
p
or
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d
A
g
u
ila
r
Makefile
:
Remov
e
usage
of deprecat
e
d Python
"has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
uilar
difftool:
Fix '--gui' when
d
iff
.
guitool is
unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800
-
difftool
.
s
h: Test
m
ergeto
o
l
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
v
id Aguila
r
difftool: Update c
o
p
yr
i
gh
t
notices
t
o lis
t
eac
h
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
difftool: Use eval to expand '--ext
c
md' exp
r
essions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguila
r
difftool: A
d
d '-x'
a
nd
as
an al
i
as fo
r
'--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Agu
i
lar
t7800-dif
f
to
o
l
.
s
h
:
S
i
m
p
lify t
h
e --extcmd
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
i
lar
git-diff
.
t
x
t
: L
i
n
k
to git-diff
t
ool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
d
i
ffto
o
l: Allow s
p
ecifying un
c
onfigured commands wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftoo
l
--help
e
r: Rem
o
ve
u
se of
the GIT_ME
R
GE_
T
OOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
ftool--h
e
lper: Up
d
ate copyright
a
nd remove di
s
t
racti
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guil
a
r
g
it-difftool: Add '--
g
u
i
'
f
o
r selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vi
d
Aguil
a
r
t
7800-di
f
f
tool: Set
a bogus tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
hel
p
:
D
o not unn
e
cessa
r
ily look for a
r
e
pos
i
t
o
ry
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id Aguilar
su
b
m
o
dule
.
c
: Sque
l
ch a "use before assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff: generate
pret
t
y filena
m
e
s i
n
prep_temp_b
l
o
b()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
A
guilar
compat: add a basename() compatib
i
lity f
u
n
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkstemps(
)
compatibility
f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
Add git-r
e
p
l
ac
e
to
.
gitigno
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mer
g
e
tool--lib: add supp
o
rt
f
o
r
ar
a
x
i
s merg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid
A
guilar
mergetool--
l
ib:
specialize d
i
ff o
p
tions for
e
merg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
me
r
geto
o
l--lib: simplify API
u
sag
e
b
y
removing
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
ffto
o
l/merg
e
tool
:
r
efact
o
r commands to use git-m
e
rgetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool
:
use $(
.
.
.
) instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
bash completion: add git-di
f
ft
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
diffto
o
l: add supp
o
rt
for a difft
o
ol
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
fftoo
l
: ad
d
v
arious git-dif
f
tool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
tool: mov
e
'
g
it-difftool' o
u
t of contri
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
diff
t
o
o
l: add a -y sho
r
t
cu
t
f
or --no-p
r
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
dif
f
tool: use pe
r
l built-i
n
s whe
n
testing
f
o
r
m
s
ys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
f
tool: rem
o
ve the backup
f
ile fea
t
u
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
o
o
l
: remove merge
o
p
t
ions for
o
pendiff
,
tk
d
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
v
eryday:
u
se
the
d
a
shless form of
git-in
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Aguil
a
r
contri
b
/d
i
ff
t
oo
l
:
u
s
e
a
se
p
arate con
f
ig namespace fo
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id Aguilar
c
o
ntrib/difftool: D
o
n't
repeat merge tool
c
a
n
d
idates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
tool: put the cursor on the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguilar
d
i
ff
t
ool: f
i
x documenta
t
ion problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Ag
u
ilar
cont
r
i
b
: a
d
d 'git difftoo
l
' for launching
c
o
mmon m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
A
g
uilar
git-mer
g
etool:
properly
h
andle "git mergetool -- f
i
len
a
me"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d Ag
u
il
a
r
tests: add a testca
s
e for "git
s
u
b
module
s
y
nc
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Agu
i
lar
git-submodule: add
"sync
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: re
p
l
a
ce duplicate
d
co
d
e with a modu
l
e_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PAT
C
H
] gitk: D
o
n't
show local changes when
w
e t
h
ere
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree