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
t7800: modernize tests
2013-02-21
David Agu
i
lar
t7800: mod
e
rnize tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: update
copyright no
t
i
ce
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vid Agui
l
ar
difftool: silence unini
t
iali
z
ed va
r
iable warni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguilar
p4mer
g
e: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
dif
f
tool--helper: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
d
o
c: generate a li
s
t of valid merge t
o
ols
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
Aguilar
mergetool--lib: add functions for finding
a
vail
a
ble
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: im
p
rove the
h
elp te
x
t in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
mergetool--l
i
b:
simplify c
o
mman
d
exp
r
e
ssio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
id Aguilar
m
ergetools: simplify how
w
e handle "vim" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
mergeto
o
l--lib: improve show
_
tool_hel
p
() ou
t
put
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergetoo
l
s
/
vim:
r
emov
e
r
e
d
undant di
f
f comma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d Aguilar
m
e
rget
o
ols/p4merge: H
o
nor
$
TM
P
DIR
for
the /dev
/
nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
Aguil
a
r
mergetools/p4
m
erge: Han
d
le
"/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
m
e
rget
o
ol-
-
lib: Allow cus
t
o
m
c
o
m
m
a
n
ds to ov
e
rride buil
t
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk:
R
ename
't
a
gcontents' t
o
'ca
c
h
e
d_tagcont
e
nt'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk:
Teach "Reread referenc
e
s"
t
o
reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
a
v
i
d
A
guila
r
mergetool,diffto
o
l: Docu
m
e
nt --
t
ool-hel
p
consistentl
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difftool: Disable --sym
l
inks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle compa
r
e() r
e
turn
i
n
g
-1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difft
o
ol: Wra
p
l
ong l
i
nes f
o
r reada
b
ilit
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool:
C
hec
k
all return codes from comp
a
re()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diff
t
ool: Handle
f
inding
me
r
g
e
too
l
s
/ in a pa
t
h with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguil
a
r
diffto
o
l: Use sym
l
inks wh
e
n diffing against the wo
r
ktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftoo
l
: Call the t
e
mp directo
r
y "git-di
f
ftoo
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
o
ol: Move option values into
a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
ifft
o
o
l
: Eliminate global va
r
iables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Sim
p
li
f
y p
r
int_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
A
guilar
t7800: Tes
t
d
ifftool passing ar
g
uments to
d
iff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
id Ag
u
i
l
ar
merge
t
ool:
P
r
o
vid
e
an empty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
a
v
id Aguil
a
r
Makefi
l
e:
Improve co
m
p
il
e
r
h
e
a
de
r
dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/meld: Use '-
-
output'
when
available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--
l
i
b: Refac
t
or tools
into separate
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
ergetool--lib: Make style consistent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difft
o
ol--
h
e
l
per: Make style consis
t
ent w
i
th git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
a
vid
A
g
u
i
lar
t/t750
3
-pre-commit-ho
o
k
.
sh: Ad
d
GIT_PREFI
X
test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-
m
e
rgetool--lib: Make vimdiff retain the curre
n
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
git: Re
m
ove
h
andling
f
o
r GIT
_
PREF
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
setu
p
: Provide
GIT
_
P
R
EFIX t
o
built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David A
g
uilar
submodule sy
n
c: Update "subm
o
dule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Aguilar
mergetool: Sk
i
p
autor
e
solved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Ag
u
ila
r
Docume
n
t
ation: Explain git-merget
o
o
l
's use of
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
a
v
id
Aguilar
Makefile: Rem
o
v
e usag
e
of deprecated Python "
h
as_
k
ey
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
av
i
d
A
g
u
ilar
difftool:
Fix
'
--gui' when
d
iff
.
guitool is u
n
configured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
avi
d
Aguilar
t7800-
d
i
f
f
t
o
o
l
.
sh: Test me
r
getool
.
promp
t
fallbac
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid
Aguilar
difftool: Up
d
ate copyright notices to
list e
a
ch
y
e
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftool:
Us
e
eval to expand '--ex
t
cmd'
expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool: Add '-x'
and as an alias for '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t
7
800-difftool
.
sh: Simplify the --extc
m
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguila
r
git-diff
.
txt:
Link to g
i
t-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool:
A
llo
w
specifyi
n
g unconf
i
gured
commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
di
f
f
t
ool--helper: R
e
mov
e
u
s
e of the G
I
T
_
MER
G
E
_
TO
O
L
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
i
lar
difftool--helper
:
Update c
o
pyright and
r
emove d
i
stracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-diff
t
o
o
l: Ad
d
'--
g
ui' for selecting a G
U
I to
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uilar
t78
0
0-difftool: Set
a
b
o
gus tool
for
u
se by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Davi
d
Agu
i
l
a
r
h
e
lp: D
o
not unnecessa
r
ily loo
k
for
a
repo
s
i
t
ory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
i
l
ar
s
u
bmodule
.
c
:
Squelch a "u
s
e
b
efore assig
n
men
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
d
i
ff:
ge
n
erate p
r
etty filenames in prep_
t
em
p
_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
compat:
add a basena
m
e(
)
compati
b
ility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mkstemps() co
m
patibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git
-
r
e
place to
.
git
i
gnore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
lar
mergetool--lib: add su
p
p
o
rt for araxis merg
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merg
e
tool--lib: sp
e
cialize
d
iff options f
o
r emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid A
g
uilar
mergetool--lib: sim
p
li
f
y A
P
I usage by re
m
oving more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
i
fftool/
m
ergeto
o
l: refactor
com
m
ands to use git-m
e
r
getoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agui
l
ar
mergetool: use $
(
.
.
.
) instead of `
b
ackticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d A
g
u
ilar
bash completio
n
: add git-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add
s
up
p
ort
for a
difftool
.
p
rompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
i
ffto
o
l: a
d
d va
r
ious git-
d
ifftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool:
move '
g
it-dif
f
t
ool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
: add
a -y
shortcut for --no
-
promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
i
lar
difft
o
o
l
: us
e
perl built-ins when
testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
i
f
ftoo
l
: remove th
e
backup
file fe
a
t
u
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
ifftool: remo
v
e merge op
t
ions for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguil
a
r
everyday
:
us
e
the dashless form of gi
t
-
init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Ag
u
ilar
c
o
n
t
rib/dif
f
tool
:
use a separa
t
e
config
n
amespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Agu
i
l
a
r
contrib/dif
f
t
o
o
l: Don't
r
e
p
eat merg
e
t
ool candid
a
tes
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Aguilar
diffto
o
l: put
t
he cursor
o
n the e
d
itable file for Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid
A
guilar
diffto
o
l: fix document
a
tion
prob
l
ems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguilar
contrib:
a
d
d 'git difft
o
ol' for launchi
n
g c
o
mmon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
it-merg
e
too
l
: properly
handle "git merge
t
ool -- filena
m
e"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
A
guilar
t
e
sts
:
a
d
d a testcase for "
g
it sub
m
o
d
ule
syn
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
g
i
t-submodule: add
"
sync
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid
A
gu
i
lar
git-submodule: replace
dup
l
icated code with a mo
d
ule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguilar
[PATCH] gitk: Don't show
l
ocal c
h
anges
when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree