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
mergetool--lib: improve show_tool_help() output
2013-01-28
D
avid
A
g
u
i
lar
mergetool
-
-lib: imp
r
ove s
h
ow_tool_help() out
p
ut
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mer
g
etools/vim: re
m
ove redundant d
i
ff
com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: Allow
c
u
s
t
om commands
t
o overr
i
de
b
uilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gitk: Rename 'tagc
o
n
t
ents' to 'cached_t
a
gcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk: T
e
a
c
h
"
Reread references"
t
o reload t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
m
e
r
g
etool,difftool
:
Document --t
o
ol-help
consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
difftool
:
Disa
b
le --
s
ymlink
s
on c
y
gwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Ag
u
ilar
difftool: Handle compare() returni
n
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftool: Wrap long
l
ines for readabi
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid
Aguil
a
r
difftool:
Check all r
e
turn codes from co
m
pare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftool: Handle finding mergetools/
i
n a pat
h
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Use symlinks when diffin
g
ag
a
inst
t
he
w
or
k
tree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
d
i
fftool: Call t
h
e temp directory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
diff
t
ool: Move option value
s
i
n
t
o a
h
a
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Eliminate gl
o
bal
v
ariables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftoo
l
:
Simp
l
ify
p
rin
t
_tool_hel
p
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
id Aguilar
t7800: Te
s
t difftool passing argumen
t
s
t
o
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
mergetool: Prov
i
de an empty
fil
e
w
he
n
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
Aguilar
Make
f
i
l
e: Imp
r
ove compi
l
er hea
d
er
dependency
chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
gu
i
lar
mergetools/meld: Us
e
'-
-
ou
t
put' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
mergetool--lib: Refactor tools into se
p
arate fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uil
a
r
mergetool--
l
ib: Make style consiste
n
t with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
d
ifftool--h
e
lper: M
a
k
e
style cons
i
stent with
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t75
0
3-pr
e
-c
o
mm
i
t-hook
.
sh
:
A
dd GIT_PR
E
FIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
git
-
mergetool--lib: Mak
e
v
imdiff retain the
c
urren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d A
g
uilar
git: Remove h
a
ndling fo
r
GI
T
_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Agu
i
lar
setup: Pro
v
i
d
e
GI
T
_PREFIX
t
o b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
avid A
g
ui
l
a
r
submodule syn
c
: Update "submodule
.
<nam
e
>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Aguilar
me
r
getool
:
S
kip
a
utore
s
olve
d
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Document
a
tion
:
Explain git-
m
erge
t
o
o
l's u
s
e o
f
te
m
p
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Aguilar
Make
f
ile: Remove us
a
ge
of depreca
t
ed Pyth
o
n "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid A
g
uilar
di
f
ft
o
ol: Fix '--gui' when di
f
f
.
gu
i
tool is
u
n
configur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David A
g
u
i
lar
t
7800
-
d
if
f
tool
.
sh: Tes
t
me
r
geto
o
l
.
p
rom
p
t fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguil
a
r
difftool
:
Update copyright
n
otice
s
to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool:
U
se
eval t
o
e
xpand '--extcmd' e
x
p
r
essio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
difftool: Add '-x' and as an alias
for '--e
x
tcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
t
7
8
00
-
dif
f
t
ool
.
sh: Simplify t
h
e
--extcmd
t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
i
lar
git-diff
.
txt: Li
n
k to git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
difftool:
Allow specifying
u
nc
o
nfigured c
o
mmands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--he
l
per:
R
emove u
s
e
o
f the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
fto
o
l
-
-helpe
r
: Up
d
ate copy
r
ight and
r
e
move distrac
t
i
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uila
r
git-diff
t
ool: Add '
-
-gui
'
for s
e
l
e
cting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
t78
0
0
-
di
f
fto
o
l: S
e
t a bogus too
l
fo
r
use by t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Agui
l
ar
he
l
p: D
o
not unnecessar
i
ly look for a
r
e
p
o
sit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
u
bmodule
.
c: Squelch a "use before
a
ssi
g
nment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
Aguilar
diff:
g
en
e
rate pretty file
n
ames in pr
e
p_temp_
b
l
ob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a b
a
sename() comp
a
ti
b
i
lity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
com
p
at: ad
d
a mkstem
p
s() com
p
a
t
ibility f
u
nc
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Ad
d
git-re
p
lace to
.
gitignor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Aguilar
merget
o
ol--lib: add
s
uppo
r
t
f
or araxi
s
me
r
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Agu
i
lar
me
r
getoo
l
--lib: specialize d
i
ff
o
ptio
n
s
for emerg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id Aguilar
merge
t
ool--lib
:
simpl
i
fy
A
P
I
usage by re
m
oving
m
ore
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool/me
r
getool: refact
o
r commands to us
e
git-merg
e
t
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
merge
t
ool:
use
$
(
.
.
.
) instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
bash completio
n
: add g
i
t-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifft
o
ol: add sup
p
ort for a diffto
o
l
.
prompt
config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
difftool:
a
dd various git-dif
f
tool test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
f
ftoo
l
: move 'git-di
f
ftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifftool: add a
-
y shortcut for --no-pro
m
pt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d A
g
uilar
difftoo
l
: use perl built-
i
ns whe
n
testing f
o
r m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: remove
t
h
e
b
ackup f
i
le featu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftoo
l
: remove merge options
for opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
ilar
e
veryday
:
use the dashless fo
r
m of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David
A
guilar
contrib
/
difftool: use a se
p
arate config namespa
c
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
o
ntrib/difftool: Don
'
t
rep
e
at merge
t
o
ol candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uilar
difft
o
ol: p
u
t
the curso
r
on the
edi
t
able file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
Agui
l
ar
d
ifftool: fix
d
o
cumenta
t
ion p
r
obl
e
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
Agu
i
lar
c
ont
r
ib: add 'git difftool
'
for
laun
c
hing com
m
on mer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
u
i
lar
git-mer
g
etoo
l
: properly handle "git mergetool
-
- fi
l
ena
m
e"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a testcase
f
or "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
avid Agui
l
ar
git-submodule: add "
s
ync" comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguilar
git-s
u
b
modul
e
: repl
a
c
e dupl
i
cated code wit
h
a modu
l
e
_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Agu
i
lar
[PATCH] gitk: D
o
n't show loc
a
l changes
w
h
en we the
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree