repo.or.cz
/
git
/
jrn.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
David Ag
u
ilar
m
e
rgetool--
l
ib: improve s
h
ow
_
tool_help() ou
t
put
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergetools/vim: remove redundant d
i
ff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uil
a
r
mergetool--lib:
A
llow custom co
m
m
a
nds to override b
u
ilt-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
git
k
: Rename 'tagcontents' to 'cach
e
d_tag
c
on
t
ent
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: Teac
h
"Reread
r
eferences
"
to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
m
e
rgetool,difftool: Docume
n
t --tool-help
consist
e
ntl
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fftool: Disabl
e
--symlinks on c
y
gwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: H
a
ndle compare()
r
e
t
u
r
n
i
ng -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difftool: Wrap long lines for
r
eadabi
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
ifftoo
l
: Check all return codes from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
ol: Handle finding mergeto
o
ls/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Use sym
l
inks when diffi
n
g
aga
i
nst t
h
e work
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
ff
t
ool:
C
all
t
he temp d
i
rectory "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id A
g
uila
r
d
ifftool: Mo
v
e opt
i
on values i
n
t
o a has
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminat
e
g
lobal variable
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
i
fftool
:
Sim
p
l
i
fy
p
rint_too
l
_h
e
lp()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Agui
l
ar
t7800: Test di
f
ftoo
l
passing argumen
t
s
to
d
iff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mer
g
etool:
Provide an em
p
t
y
fi
l
e when ne
e
ded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguilar
Makefile: Impr
o
v
e
c
o
mp
i
l
e
r
header dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
m
ergetool
s
/
m
eld:
U
se '--output'
when av
a
ilable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetool--lib: Refactor tools into
separ
a
te files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
i
lar
mergeto
o
l--lib: M
a
ke
style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guilar
difftool--help
e
r:
Mak
e
style c
o
nsi
s
tent w
i
th g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
i
d
Aguilar
t/t
7
503-pr
e
-com
m
it
-
h
o
o
k
.
sh: Add
G
I
T
_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Agu
i
lar
git
-
m
ergetool-
-
lib
:
Make vimd
i
ff retai
n
the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git: Remove hand
l
ing for G
I
T_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guila
r
setup: Provide GIT_PREFIX to buil
t
-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d Aguilar
submodule sync: Update "submodule
.
<na
m
e>
.
u
rl"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
rgetool: Skip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation:
Ex
p
lain
git-mergetool's use of tem
p
orar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefil
e
: Rem
o
ve usa
g
e of depr
e
ca
t
ed Python "has_k
e
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
uila
r
d
if
f
tool: F
i
x '
-
-gui' when diff
.
guitool is
u
nconfigur
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Aguilar
t
7
800-difftoo
l
.
sh:
Tes
t
m
e
rgetool
.
prompt f
a
llbac
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uila
r
difftool: Update copyright notices
to l
i
st each
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftool: Use
e
val to expand '--extcmd' exp
r
e
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftool: Add '-x' a
n
d as an alias
for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftoo
l
.
sh
:
Simplify
th
e
-
-
extcmd
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
g
it-di
f
f
.
txt: Link to git-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
diff
t
ool
:
Allo
w
specifying unconfigure
d
commands wit
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
fto
o
l--helper: Re
m
ove use of
t
he GI
T
_M
E
RGE_TO
O
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool-
-
helper: Update c
o
pyright and remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Add '--gu
i
' for
sele
c
ting
a
GUI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguilar
t7800-difftool: Set
a
bogus t
o
o
l for use
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
i
lar
help:
Do not unneces
s
a
rily look f
o
r a
repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodul
e
.
c:
Squ
e
l
c
h a "use
before assignment" warn
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
diff: generate pre
t
ty fi
l
e
names in
p
r
ep_temp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Agu
i
lar
c
o
mpat: add a basename
(
) compatibility fun
c
ti
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
mkstemps() compatibility f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
u
i
lar
Add git-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d
Aguilar
merget
o
ol--lib:
a
dd suppo
r
t for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
u
i
lar
mergetool--
l
ib: spe
c
ialize diff
o
p
tions for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d Aguilar
mergetoo
l
--lib: simpl
i
fy API usage by
r
e
mov
i
ng more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Agui
l
ar
difftool/mergetool: refactor co
m
mands to us
e
git-mer
g
etool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
ar
merg
e
tool: use
$(
.
.
.
) in
s
tead of `bac
k
ti
c
ks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completi
o
n: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
difftool: add
s
upport for a
d
ifftoo
l
.
p
r
o
m
p
t
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: add var
i
ous git-diffto
o
l tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Agui
l
ar
difftool: mov
e
'
g
i
t-diff
t
ool' out
of
cont
r
i
b
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: add a
-
y s
h
ortcut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
iff
t
ool: use perl b
u
ilt-ins when t
e
st
i
ng for
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
difftool: rem
o
v
e t
h
e b
a
ckup file f
e
a
t
ure
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
d
iff
t
oo
l
: remov
e
merge opt
i
on
s
f
o
r ope
n
diff,
tkd
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid Aguilar
eve
r
yda
y
:
use the dashless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Ag
u
ilar
contrib/di
f
ftool
:
use a
separ
a
te co
n
f
i
g
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
i
d Aguil
a
r
contrib
/
d
i
fftool:
D
on't repeat
merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
difftoo
l
:
p
ut the cursor on
the edit
a
ble file f
o
r Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
fftool: fix
d
o
c
umen
t
at
i
on problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contri
b
: ad
d
'
g
it d
i
f
ftool'
f
or
launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
A
guilar
git-m
e
rgetool: prope
r
ly
handle "git mer
g
etool -- fi
l
ename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
te
s
ts:
a
d
d
a
testcase
f
or "gi
t
submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Aguilar
g
i
t-submo
d
ule: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodule: replace duplicat
e
d code with a m
o
dule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk:
D
on't
show
l
ocal changes wh
e
n
we
t
here
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree