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
t7004: extract generic "GPG testing" bits
2011-08-19
David Ag
u
ilar
merge
t
oo
l
s/meld
:
Us
e
'--outp
u
t' when avai
l
able
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
mergetool--lib: Refactor tools into separate
f
i
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguil
a
r
m
ergetool--li
b
:
M
ake styl
e
con
s
istent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
A
guilar
difftool--h
e
l
p
er: Make sty
l
e c
o
nsistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ila
r
t/t7503
-
pre-
c
ommit-hook
.
sh:
A
dd
GIT_
P
REFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Agu
i
lar
g
i
t-
m
ergetool--lib: Make
v
imdiff
re
t
ain the
c
u
r
rent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
git: Remove
h
andling for GIT_P
R
E
FI
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
setu
p
: Pr
o
vi
d
e
G
I
T_PR
E
FIX to buil
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
i
d Aguilar
subm
o
dule sync: Update
"submodule
.
<name>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
i
d
Aguilar
mergetool: Skip
a
utoresolved p
a
t
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
D
o
cumentation: Explain git-merget
o
ol's
u
se of
t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Ag
u
il
a
r
Make
f
i
l
e
:
Remove usage o
f
de
p
recated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
diffto
o
l: Fi
x
'--gu
i
'
whe
n
diff
.
guito
o
l
is
u
nc
o
n
f
igur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
v
i
d
A
g
u
il
a
r
t
7800-di
f
ft
o
ol
.
sh: Te
s
t mergetool
.
p
rompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Agui
l
ar
diffto
o
l
: Upd
a
t
e co
p
y
r
igh
t
notic
e
s to l
i
s
t each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguil
a
r
difftool: Use
e
va
l
to expa
n
d
'
--
e
xtcmd' expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
i
d A
g
uilar
diff
t
ool
:
Add '-
x
' and
as a
n
alia
s
for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t78
0
0-
d
iffto
o
l
.
sh: Si
m
plify the --extc
m
d
t
est
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-d
i
ff
.
t
x
t
: Li
n
k to
git-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
difftool: Allow specif
y
ing unconfigured com
m
ands
wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
ftool-
-
he
l
per: Remove use of the GI
T
_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Agu
i
lar
d
ifftool--h
e
lper: Update copyright
and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
git-difftool: A
d
d
'--gui' f
o
r selecti
n
g
a
GUI
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
la
r
t7800-diff
t
ool: Set a bo
g
us tool for u
s
e by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: D
o
not
u
nne
c
e
ssaril
y
look for a repos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
A
guilar
submo
d
u
l
e
.
c
: Sque
l
c
h a "
u
se
b
e
fore
a
s
si
g
nment"
warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff:
generate pr
e
t
ty filenam
e
s in
prep
_
temp_blo
b
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
base
n
am
e
(
) compat
i
b
ility
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
c
ompat: add a mkstem
p
s
(
) compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
Ad
d
g
i
t-rep
l
ac
e
to
.
gitig
n
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David
Ag
u
i
lar
mergetool--lib: ad
d
support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Agui
l
ar
merge
t
ool
-
-lib: speciali
z
e diff option
s
for
emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Agui
l
ar
merget
o
ol--lib: simpli
f
y API us
a
ge by
removing mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fft
o
ol/me
r
g
e
to
o
l: refa
c
tor commands to use git
-
mergetoo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
mergetool: use $(
.
.
.
)
i
nstead of `
b
ackticks
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguil
a
r
bash completion
:
add
g
it-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: add supp
o
rt for a difftool
.
prompt
c
onfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftoo
l
: add
v
arious g
i
t-dif
f
t
o
ol tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
A
g
uilar
di
f
ftool:
move 'git-difftoo
l
' out of
contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
: add
a -
y
s
hortcut for --no-pro
m
pt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
ila
r
difftool: use perl b
u
ilt
-
in
s
when t
e
sting fo
r
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
o
o
l: remove
the bac
k
up file
f
eature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
r
em
o
ve
m
erge o
p
tions for
opend
i
ff, tkdif
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David
Aguilar
e
v
eryday
:
u
s
e the dashl
e
ss
f
o
r
m of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/diff
t
ool: use a separa
t
e conf
i
g namesp
a
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
co
n
trib
/
dif
f
t
o
ol: Do
n
't repe
a
t merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
difftool: put the cursor on the
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: fix documen
t
ation proble
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add 'gi
t
di
f
ftoo
l
' for launc
h
ing common
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d Aguilar
git-m
e
r
g
et
o
ol
:
prope
r
ly handle "git m
e
rgeto
o
l
-- fi
l
ename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avid
Aguil
a
r
tests: add a te
s
tcase for
"
git
su
b
mod
u
l
e sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
avid A
g
uilar
gi
t
-s
u
bmodul
e
:
add "sy
n
c" com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
g
i
t-sub
m
od
u
le: r
e
place
d
u
p
l
icat
e
d
cod
e
wi
t
h a module
_
list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Ag
u
i
l
ar
[PAT
C
H] g
i
tk
:
Don't show local cha
n
ges when we th
e
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree