repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
remove ecb parameter from xdi_diff_outf()
2010-03-29
Dav
i
d Aguilar
Makefile
:
Re
m
o
v
e usage o
f
deprecated Python "has_ke
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
guilar
diffto
o
l: Fix '--gu
i
' whe
n
diff
.
gu
i
tool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7
800-difftool
.
sh: Test mergeto
o
l
.
p
r
ompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
ui
l
ar
d
i
fft
o
ol:
U
pdat
e
c
o
p
yright notices to li
s
t each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
difftool: Use eval to expan
d
'
-
-e
x
tcmd' express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
difftool:
Add '
-
x' and as a
n
a
li
a
s f
o
r '
-
-extcm
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Agui
l
ar
t7
8
00-difft
o
ol
.
sh: Si
m
p
l
i
f
y the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Ag
u
ilar
git-diff
.
tx
t
: Link t
o
git-
d
iffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool:
A
llow specifying unconf
i
gured
commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool--helper: Remove
use of
t
he GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--he
l
per:
U
pdate copyri
g
ht and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
gi
t
-
d
i
f
f
t
ool: Add '--g
u
i'
f
or selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Agui
l
ar
t7800-difftool
:
Set
a
bogus
tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
A
g
uilar
h
elp: Do not
unnecessar
i
ly
l
ook
for a
r
epos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
v
id Aguilar
submodule
.
c: Sque
l
ch a "use before assignment" warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
ui
l
a
r
diff: gene
r
ate pretty filena
m
es
i
n prep
_
temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
u
ilar
c
om
p
at
:
add a basename() compa
t
ib
i
li
t
y fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat:
add
a
mkstem
p
s() compati
b
il
i
ty functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
A
guilar
Ad
d
git
-
replace
t
o
.
gitignor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David A
g
u
ilar
mergetool--
l
i
b: ad
d
suppo
r
t for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguil
a
r
mergetool--lib: spe
c
ialize diff opt
i
ons for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merg
e
tool--lib: s
i
mplify API usa
g
e by removin
g
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool/mergeto
o
l
:
refa
c
tor commands to use git-
m
erg
e
tool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
m
e
rgeto
o
l: use $(
.
.
.
)
i
n
s
tead of `backtick
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completio
n
: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: a
d
d
supp
o
rt for
a
d
ifftool
.
pr
o
mpt
con
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ila
r
di
f
ftool
:
add various
git-difftool
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: move 'git
-
d
i
fftool' out
of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gu
i
l
ar
difft
o
ol: add a -y short
c
ut
f
or --
n
o-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
use
p
erl
built-ins when te
s
ting for
msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
oo
l
: remove
t
he backup
f
ile feat
u
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool:
r
emov
e
merge options for open
d
i
ff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avi
d
Aguila
r
e
v
eryday:
u
se
t
he dashless 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
config namespa
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
id
Aguila
r
c
o
n
t
rib/difftool: Don
'
t
r
epeat
merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
diffto
o
l: put t
h
e cursor o
n
the ed
i
tabl
e
f
ile fo
r
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
difftool: fix
docu
m
entation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
c
o
ntri
b
:
a
dd 'g
i
t difftool
'
f
o
r
launching
c
ommon merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Aguilar
git-
m
erg
e
too
l
:
p
roperl
y
handle "git mergetoo
l
-- fil
e
nam
e
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
Aguil
a
r
tests: add a
t
e
s
t
c
a
se for "git
s
ubmodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-
s
ub
m
odule: add "sync" comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Aguilar
g
i
t
-submodule: replace duplicat
e
d code
with a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Ag
u
ilar
[PAT
C
H
]
gitk
:
D
o
n't show local changes when we
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree