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
Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-07-19
David Aguilar
Docu
m
en
t
ati
o
n:
E
xplain git-me
r
g
e
tool's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid A
g
u
i
lar
M
a
k
efile: Remove usage of deprecated Pyt
h
on "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguilar
dif
f
tool: Fix '--gui
'
when diff
.
guit
o
o
l is
unc
o
nfigure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d
Aguilar
t7800-diff
t
ool
.
sh: Test mergetool
.
pr
o
mpt fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Ag
u
il
a
r
difftool: Up
d
ate
co
p
y
right notices to
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
difftool: Use eval t
o
expand '--extc
m
d' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
di
f
ftool: A
d
d '-x' and as an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
t7800-d
i
fft
o
ol
.
sh: Simplify the -
-
extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
g
it-diff
.
t
x
t: Link to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d Aguilar
difftool: A
l
low
spe
c
ifying unco
n
figured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
diff
t
ool--he
l
per: Remove use of t
h
e
GIT_ME
R
G
E
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
difftoo
l
--helper: Updat
e
copyrig
h
t
and remov
e
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add '-
-
gui' for sele
c
ting a GUI to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
t780
0
-difft
o
ol:
Set a bog
u
s tool
f
o
r
use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
i
lar
help: Do
n
ot unn
e
cessarily look
f
or
a
repositor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
module
.
c
:
Sque
l
c
h
a "use before assignme
n
t
" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
diff: generat
e
p
retty fil
e
names
i
n prep_
t
emp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
compat
:
add
a
b
a
sename(
)
com
p
ati
b
ility
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compa
t
: add
a m
k
stemps() com
p
atibility functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
Aguilar
Add git-replac
e
t
o
.
git
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguila
r
mergetool--lib: add su
p
p
o
rt for a
r
axi
s
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Agu
i
lar
mergeto
o
l--lib: spe
c
ial
i
z
e
d
i
f
f
o
ptions for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Ag
u
i
l
ar
mergetool--
l
ib: s
i
mplify API usage b
y
removing
m
ore
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Ag
u
ilar
diffto
o
l/
m
ergetool: refa
c
tor com
m
ands to use git
-
mer
g
et
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
mergetool:
use $(
.
.
.
) instead of `bac
k
ticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bas
h
completi
o
n: add
git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: add s
u
p
p
ort for
a difftool
.
prompt
c
o
n
fig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: ad
d
various git-dif
f
tool t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
i
la
r
difftool
:
move 'git-difftoo
l
' out of con
t
rib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Aguilar
d
i
ffto
o
l:
add a
-y shortcut
for --no-prom
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool:
use perl built-i
n
s when tes
t
ing for ms
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
gu
i
l
a
r
difftool: remove the ba
c
kup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id A
g
ui
l
ar
difftool: remove merge opti
o
ns for opendiff, tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday:
use t
h
e dashle
s
s form of
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contr
i
b/difft
o
ol: use a separate c
o
nfig nam
e
space for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Aguilar
con
t
r
i
b/diff
t
ool: Do
n
't re
p
eat merge
tool cand
i
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
i
d Ag
u
il
a
r
difftool
:
p
u
t the
cursor on the ed
i
table fil
e
for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
i
d
A
g
ui
l
ar
d
iffto
o
l: fix documentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Ag
u
ilar
contrib: add
'git
difftool' for
l
au
n
ching co
m
mon merg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
av
i
d Aguilar
git-mergetool: properly handle
"
g
it
mer
g
eto
o
l -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David
Aguilar
tests
:
add a testcase f
o
r
"
git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-sub
m
odule: add "sync"
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
v
id Aguilar
gi
t
-submodule:
replace
duplicated
c
ode with a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id Aguilar
[PATC
H
] gi
t
k: Don't show local changes when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree