repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool--helper: fix printf usage
2013-02-10
David Aguilar
difftool--helper: f
i
x pri
n
t
f usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguilar
gitk
:
Rename '
t
agcontents' to 'ca
c
hed_t
a
gconten
t
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
ar
gitk: Teach
"Reread refere
n
ces" t
o
reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test difftool pass
i
ng
a
r
guments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
lar
mergetool
:
Provide an
em
p
ty f
i
l
e
w
hen nee
d
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
A
guilar
Makefile: Improve compiler
h
ead
e
r dep
e
n
dency chec
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/
m
e
l
d
:
Use '--
o
utput
'
when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
il
a
r
merg
e
to
o
l
-
-lib
:
R
e
factor to
o
l
s into
s
epa
r
ate file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
m
erge
t
o
o
l
--lib: Make style consis
t
en
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
di
f
ftoo
l
--helper: M
a
ke style
c
on
s
is
t
e
n
t with
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
i
lar
t/t75
0
3-pre
-
co
m
mit
-
hook
.
sh: Add GIT_PREF
I
X tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
gu
i
lar
git-mergetool--lib: Make vim
d
iff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d
A
gui
l
ar
g
i
t: Re
m
ove handling for
GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
s
e
tup:
P
rovide GIT_PRE
F
IX to built-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
ub
m
o
d
u
le sync: Up
d
ate "
s
ubmodul
e
.
<
name>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mer
g
eto
o
l
:
Skip
a
ut
o
resolve
d
p
a
ths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Do
c
um
e
n
t
a
tion: Exp
l
a
i
n
g
i
t-mergetool's use of
t
e
mporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid
A
guilar
M
akefile: Remove
u
s
a
ge of d
e
precated Pyt
h
on "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftoo
l
: Fix
'
--
g
ui'
w
hen diff
.
guito
o
l is un
c
o
n
figured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
ilar
t78
0
0-difft
o
ol
.
sh: Test mergetool
.
prompt fall
b
ack
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
di
f
f
t
ool: U
p
dat
e
copyright notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
i
lar
d
if
f
t
o
o
l
: U
s
e eval to expand '
-
-ex
t
cm
d
'
expressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid
A
guilar
d
i
ffto
o
l: Add
'
-x' and a
s
a
n
alias for
'
--e
x
tcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
t7800-dif
f
tool
.
sh: S
i
mplify the
--extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
gi
t
-diff
.
txt: Link to git-
d
if
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
: Allow
s
peci
f
yin
g
unco
n
f
igured c
o
mmands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid
A
gui
l
ar
d
iffto
o
l--h
e
l
p
er: Remove us
e
of the GIT_MERG
E
_
TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
av
i
d A
g
uilar
diffto
o
l--h
e
lper:
U
pda
t
e copyright an
d
remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Agui
l
ar
git-difftool
:
Add '--gu
i
'
f
or selectin
g
a GUI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
u
ila
r
t7800-diffto
o
l
:
Set a bog
u
s to
o
l fo
r
use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
elp: Do n
o
t unnec
e
ssarily look for a reposit
o
ry
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch a "use before a
s
signment"
w
arning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
diff
:
gen
e
ra
t
e p
r
e
t
ty filenames in prep_
t
emp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
p
at: add a basenam
e
() compati
b
i
l
ity fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Aguilar
c
ompat: a
d
d
a mkstemps()
c
o
mpatibility fu
n
ction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-repl
a
ce to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merge
t
oo
l
-
-
lib: add su
p
po
r
t for
araxis m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Aguilar
mergetool
-
-l
i
b
:
specializ
e
diff options
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
m
e
rgetool--l
i
b:
s
implify API usage by remo
v
ing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool/m
e
rgetool
:
r
e
fact
o
r comm
a
n
ds to
use gi
t
-mer
g
etool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
ilar
mergeto
o
l:
u
se $(
.
.
.
)
instead of `b
a
ckticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
bash completion:
a
dd
git-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agui
l
ar
dif
f
t
o
ol: ad
d
suppo
r
t
for a
d
i
f
ft
o
ol
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agui
l
a
r
difftoo
l
: add var
i
ous git-difftoo
l
tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-diff
t
ool'
out of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: add
a
-y sh
o
r
t
cut for --no-prom
p
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
u
s
e
perl built-ins when testi
n
g for m
s
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guilar
diff
t
o
o
l
: remove the backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: r
e
m
ove merge options for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguil
a
r
e
v
eryday: u
s
e the
das
h
l
e
ss form of
g
it-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguil
a
r
contrib/difftoo
l
:
u
se a separate conf
i
g
namespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
contri
b
/
diff
t
ool: D
o
n't repeat m
e
rge tool ca
n
didates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
i
la
r
diff
t
o
o
l: put the
curs
o
r
on the edita
b
l
e
f
ile for
Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid
A
guil
a
r
dif
f
tool: fix document
a
tion probl
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
c
o
n
trib: add
'git diffto
o
l' for lau
n
ching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
i
l
a
r
g
i
t
-
merg
e
tool:
properly
h
andle "
g
it merg
e
tool -- filenam
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
Aguilar
tests
:
add
a
testcase for "git subm
o
d
u
le sy
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uilar
gi
t
-submodule: add
"sync" comman
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
A
guil
a
r
g
it
-
sub
m
odule: replace duplicated code wi
t
h a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David
Ag
u
ilar
[
PATCH] g
i
tk: Don't show l
o
cal changes when w
e
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree