repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xml_entities(): use function strbuf_addstr_xml_quoted()
2012-10-11
David
Aguilar
me
r
getools/
p
4m
e
rge: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
v
id Aguilar
m
ergetool-
-
lib
:
Allow cu
s
tom comman
d
s to overrid
e
built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Agu
i
lar
gitk: Rename
'
tagco
n
tents' to 'c
a
che
d
_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk: Te
a
c
h "
R
eread references" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguilar
mergetool,diff
t
ool: Do
c
u
m
ent --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disable
--syml
i
nks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difftool: Handle compare() re
t
urning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Ag
u
ilar
difftool:
Wrap lon
g
lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
ar
difftool: Ch
e
c
k
all re
t
ur
n
codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguil
a
r
d
i
fft
o
ol: Ha
n
dle finding mer
g
et
o
ols/ in
a pa
t
h
w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Ag
u
il
a
r
difftool:
Use symli
n
k
s
when
d
iffing a
g
a
inst the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l: Call
t
h
e
t
emp dire
c
tory "g
i
t-dif
f
tool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftoo
l
: Mo
v
e option va
l
ues into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool
:
Eliminate
g
lob
a
l variabl
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
guilar
d
i
fftool
:
Simplify
p
rin
t
_tool
_
help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
ilar
t7800:
T
est difftoo
l
pas
s
i
n
g arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
id Aguilar
mergetool: Provide an
e
m
pty
f
ile when
n
eeded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: I
m
pr
o
ve compiler header dep
e
ndency chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id A
g
uilar
mergetools/meld: Use '
-
-
o
u
t
p
u
t' when availab
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avi
d
A
guila
r
mer
g
e
t
ool--li
b
: Refacto
r
to
o
ls i
n
t
o
se
p
arate
fi
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
me
r
get
o
ol--lib: Make sty
l
e consis
t
ent
w
ith git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difft
o
o
l
--he
l
per:
Make style cons
i
stent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
a
v
id Aguilar
t/t7503
-
pre-commit-hook
.
s
h
: Add GIT_PRE
F
I
X
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t
-
mergetool--lib: Ma
k
e vimdiff retain the curr
e
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
git: Remove hand
l
i
ng for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setu
p
:
P
rovide GIT_PRE
F
IX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
A
g
u
ilar
s
ubmodul
e
sync: Up
d
at
e
"s
u
bmodule
.
<na
m
e>
.
ur
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
A
gu
i
l
ar
mergetool:
Sk
i
p autoresolved
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
oc
u
mentation: Expla
i
n g
i
t-mergetool's use of te
m
porary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid
A
guil
a
r
M
a
kef
i
le: Remove usage of de
p
recated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
d
ifftool: Fi
x
'--gui' when diff
.
g
uitool is
unconfig
u
red
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vi
d
Ag
u
ilar
t7800-difftool
.
sh:
T
est mergetoo
l
.
p
r
o
m
p
t
f
allback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
guilar
difftool: Up
d
ate copyright notices t
o
l
i
st each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Us
e
eval to expan
d
'--extcmd' ex
p
re
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diffto
o
l: Add '-x'
a
nd as an
a
lias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t780
0
-difftool
.
sh: Simpli
f
y the
-
-extcm
d
t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Agui
l
ar
git-diff
.
txt
:
Link
to git-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool: Allow specifyi
n
g unconfigured co
m
m
a
nds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
u
ilar
diffto
o
l--helper: Remov
e
u
se of
t
he
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper: Update co
p
yright and remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
git-d
i
f
ftool: Add '--gui' for selecting
a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
t7800-
d
i
f
ftool
:
Set a
b
ogus too
l
f
o
r
use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
help: Do not unnecess
a
r
ily
look for a repo
s
itory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
subm
o
dule
.
c: Sque
l
ch a "use before
a
ssignment" warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
iff: generate pretty filenames in prep_
t
e
m
p_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
m
p
at: a
d
d a basename() compati
b
i
lity
f
un
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mk
s
temps() c
o
m
p
a
tibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
Add git-replace
to
.
g
i
tignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Aguilar
merge
t
ool--l
i
b:
a
d
d
support for araxis m
e
rg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
gui
l
ar
mergetool--
l
i
b
: specialize
d
iff opt
i
ons for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Agu
i
lar
m
erget
o
ol--l
i
b
:
simplify API
usage
b
y remo
v
i
ng more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol/mergetool
:
refactor commands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
ilar
mergetool: use $
(
.
.
.
) in
s
tea
d
of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
bash compl
e
ti
o
n:
add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
di
f
fto
o
l:
add s
u
pport for a
d
ifftool
.
pr
o
m
pt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
d
i
f
ftoo
l
: a
d
d va
r
ious git-difftool test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agui
l
a
r
dif
f
tool: move 'git-di
f
ft
o
o
l' out o
f
cont
r
ib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
i
fftool: add
a
-
y sh
o
rtcut f
o
r --
n
o-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: use perl bui
l
t
-ins when
t
esting for
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
di
f
ftool: remove the
backu
p
file
f
eature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difft
o
ol: remove mer
g
e
optio
n
s
for opendiff, tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguilar
ev
e
ryday: use the dashless form of gi
t
-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Agu
i
lar
contrib/di
f
ftool: use a
s
epa
r
ate conf
i
g n
a
mespa
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d A
g
uilar
contrib
/
difftool: Don'
t
repeat
m
erge tool c
a
ndidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
difftool: put the cursor on the e
d
itable file for
V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
f
f
tool: fix documentation prob
l
e
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Agu
i
lar
co
n
trib: add 'git difft
o
ol' for
l
aunc
h
ing common m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool
:
p
roper
l
y handle "git m
e
rgetool --
f
ilename
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id Agu
i
l
ar
tests:
a
dd a testc
a
se for "git sub
m
odul
e
sy
n
c"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-
s
u
bmo
d
ule:
add "sync"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Aguilar
git-submodule: replac
e
d
u
plicated co
d
e with a module
_
list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PAT
C
H]
g
it
k
: Don't show local changes when we
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree