repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://git.bogomips.org/git-svn
2010-01-23
Davi
d
Aguila
r
t7800-
d
iffto
o
l
.
sh: Test mergetool
.
pr
o
mpt f
a
l
l
ba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguilar
difft
o
ol: Update copyright no
t
ices
t
o list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
u
ilar
diffto
o
l: Use eval to
expan
d
'--extcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
difftool:
Add '-x'
and as
an
alias for
'
-
-
e
x
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
t7800-
d
ifftool
.
sh:
S
impl
i
fy
th
e
--extcmd t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
git-diff
.
tx
t
:
Link to gi
t
-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
difft
o
ol: A
l
low specifying unco
n
figured c
o
mmands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool--helper: Remove use of the GIT
_
MERG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Agu
i
la
r
difftool--
h
elper: Up
d
ate copyr
i
ght an
d
remo
v
e distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
gui
l
ar
git-diff
t
ool: Add
'
--gui'
fo
r
sel
e
cti
n
g a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
t7800-difftool: Set a b
o
gus to
o
l for us
e
b
y
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help
:
Do
n
ot un
n
ecessarily look
f
or a repositor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
i
l
ar
s
ubmodule
.
c:
S
q
uelch
a
"
u
se
b
ef
o
re a
s
signme
n
t"
w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uila
r
diff: generate p
r
etty filen
a
mes in prep_temp_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
l
ar
compat: add a basena
m
e() comp
a
tibility functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
compat: add
a mkste
m
ps() compat
i
b
ility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
Add git-rep
l
ace to
.
g
i
tignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David
Aguilar
m
er
g
e
t
o
o
l--li
b
: add suppo
r
t
f
or
a
ra
x
is merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguil
a
r
mergeto
o
l-
-
lib: speci
a
l
i
z
e
d
if
f
options for eme
r
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
A
guila
r
mer
g
e
tool--
l
ib:
simplify API usa
g
e
b
y
r
e
mo
v
ing m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool: refa
c
tor commands to use
g
i
t-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mergetool: use $
(
.
.
.
) instead of `bac
k
t
i
c
ks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
bash com
p
leti
o
n: ad
d
git-di
f
fto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
Ag
u
ilar
difftool: add suppo
r
t for
a
diff
t
ool
.
pro
m
pt c
o
nf
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: add
v
ari
o
us git-di
f
f
tool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: move 'git-difftool' out
of
c
ont
r
ib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
difftool
:
a
dd a
-
y short
c
ut for --n
o
-
p
ro
m
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agu
i
lar
dif
f
tool: use pe
r
l built-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
ftool:
r
emove t
h
e
b
ackup file featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
lar
difftoo
l
: remov
e
merge options for opendiff,
tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
a
v
id
Agu
i
lar
everyd
a
y: us
e
the dashless form o
f
git-ini
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguila
r
c
o
ntrib/difftool: use a separate co
n
f
i
g nam
e
s
p
ace
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
Agu
i
lar
cont
r
ib/difftool
:
Don't
r
e
peat me
r
ge tool
c
a
ndid
a
t
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d A
g
uilar
d
ifft
o
ol: pu
t
the cursor o
n
the editabl
e
f
i
le fo
r
V
im
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
difftool: fix docum
e
nt
a
tion proble
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
v
i
d
Aguila
r
contrib: add '
g
it difftool' for la
u
nc
h
in
g
com
m
on merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d
Aguilar
git-mergetool: properly han
d
le "git me
r
getool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Ag
u
ilar
tests: add a te
s
tcase for "gi
t
s
ubmodul
e
sy
n
c"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Davi
d
Aguilar
git-submodule: add
"
s
ync" comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-sub
m
odule: replace d
u
p
lica
t
ed code with
a modu
l
e_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Agui
l
a
r
[
PATCH] gitk: D
o
n't show local c
h
anges w
h
en we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree