repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Eliminate global variables
2012-07-23
David Agui
l
a
r
diffto
o
l: Eliminate gl
o
bal variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool:
S
i
mplify
print_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
id Aguila
r
t
7800: Test
difftool pass
i
ng arguments to dif
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid A
g
uilar
mergetool: Pro
v
id
e
an e
m
pty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
Aguilar
Ma
k
efile: Improve compiler header depen
d
en
c
y
check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
merge
t
ools/
m
eld: Use '--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib:
R
efactor tools
i
n
to separate
f
iles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
mergeto
o
l
--lib:
Ma
k
e
style
c
ons
i
stent wi
t
h g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
diff
t
ool-
-
helper: Make style consist
e
n
t
with
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
i
l
ar
t/t75
0
3
-
pre-commit-
h
ook
.
sh: Add G
I
T_
P
REFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
g
it-me
r
getool--lib:
M
ake vimdiff reta
i
n the cur
r
en
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove h
a
ndling
f
or GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
Aguilar
s
et
u
p: Pr
o
vide
G
IT_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguil
a
r
submodule s
y
nc: Update
"
s
u
b
module
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
i
d Ag
u
ila
r
mergetool: Skip
a
utoresolved pat
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Docu
m
entation: Ex
p
la
i
n git-mergetool
'
s us
e
of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguil
a
r
Make
f
i
le: R
e
move us
a
ge of de
p
recated Python
"has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
difftool
:
Fix '
-
-gui' whe
n
diff
.
guitool is
u
nconfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
A
guilar
t7800-difftool
.
sh: Test mergetool
.
prompt fa
l
lback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agu
i
lar
difftool: Upda
t
e c
o
p
y
righ
t
notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
dif
f
tool:
Use eval to
e
xpand '--extcmd' express
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
dif
f
tool: Add
'
-x
'
and as an alias for
'
--
e
xt
c
md'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800
-
difftool
.
sh: S
i
mplify
the --ext
c
md test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
t
xt:
L
ink to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
d
i
fftool: Allow s
p
ecifying unconfigured command
s
w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--he
l
per: Remove use of t
h
e GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diff
t
o
o
l--
h
elper: Upda
t
e c
o
pyr
i
g
h
t
and remove distr
a
ctin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git
-
difftool: Ad
d
'--gui'
for select
i
ng a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
t
7
800-difftool: Set a bogus
t
o
ol 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 unnecessar
i
l
y look fo
r
a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
u
bmod
u
le
.
c: Sq
u
e
l
ch
a
"use
bef
o
re assignment"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: gene
r
ate
pret
t
y
filenames in prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
mpat:
a
dd a
basename() compatibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id A
g
uilar
comp
a
t:
add a mkstemps()
co
m
patibi
l
i
t
y functio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
it-
r
eplace to
.
gi
t
ignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Aguil
a
r
mergetool
-
-lib: add support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Aguilar
mer
g
etool--li
b
: specialize diff option
s
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
A
g
u
ilar
mergetool--lib: simplify API u
s
age by
removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
ifftool/mergetool: re
f
actor
commands to us
e
git-
m
e
rgetoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
A
g
u
i
l
ar
m
ergeto
o
l: us
e
$(
.
.
.
) instead of
`
backtick
s
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
ba
s
h com
p
letion: add git-difftoo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: add
s
upport for
a
d
ifft
o
ol
.
pr
o
mpt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guil
a
r
difft
o
ol: ad
d
v
a
r
i
o
us git-diffto
o
l
t
ests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: move 'git-di
f
ftool' ou
t
of
con
t
r
ib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
ui
l
ar
di
f
ft
o
ol: add
a
-y shortcut for --no-
p
r
o
mpt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
use pe
r
l buil
t
-ins when te
s
ting for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool
:
remove
t
h
e
b
a
c
k
u
p
f
i
le feat
u
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
dif
f
tool: remove merge o
p
tions fo
r
open
d
i
f
f, tkdi
f
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
uilar
every
d
ay: use the dashless f
o
rm of git-in
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id Agui
l
ar
contrib
/
diff
t
oo
l
: us
e
a
s
epar
a
te c
o
nfig namespace f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Da
v
id
Aguila
r
con
t
rib/difftool
:
Don't repe
a
t merge tool cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
tool: put the
c
ursor o
n
the
editable file
f
o
r
V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
dif
f
tool: fix documentati
o
n problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid Aguilar
contrib: add 'gi
t
di
f
ftool' for launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git
-
mergeto
o
l: prope
r
ly
handle "git m
e
rgetool -- filena
m
e"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Da
v
id Agu
i
lar
t
e
s
t
s: add a testcase
f
or "git s
u
bmodule
s
y
n
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id A
g
u
ilar
g
it-su
b
module: add "sync" c
o
mmand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
Agu
i
lar
git
-
submodule:
replace d
u
plicate
d
code
w
ith a modu
l
e_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH]
gitk
:
Don't show local ch
a
nges wh
e
n we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree