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
D
avid Aguilar
t
7
800: moderni
z
e
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Agu
i
lar
t
7
8
00: update copyrigh
t
notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: silence uninitialized v
a
riabl
e
wa
r
ni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
p4mer
g
e: f
i
x pr
i
ntf usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
lar
diffto
o
l--helper: fix print
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
doc:
genera
t
e
a
li
s
t
of valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguilar
m
e
rgetool--l
i
b: add functions f
o
r finding av
a
ilable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
etool--lib:
i
mprove t
h
e
h
el
p
te
x
t
in guess_merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guila
r
m
ergeto
o
l-
-
lib:
simpli
f
y
c
o
mmand expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguila
r
m
er
g
e
t
ool
s
: sim
p
l
i
fy
h
ow we handle "vim"
and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
mergetoo
l
--lib: imp
r
ove
s
h
ow_tool
_
hel
p
(
)
out
p
ut
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
i
d Aguilar
mer
g
e
t
o
o
l
s
/vim: remove redun
d
a
n
t
d
i
ff c
o
mmand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David A
g
uilar
m
e
rgetool
s
/p4
m
erge: Honor
$
TMPDIR for the
/
dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
av
i
d Aguilar
m
e
rgetools
/
p
4
merge: Handle
"
/
dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Ag
u
ilar
mer
g
eto
o
l--lib: Allow
c
ustom comm
a
nds to ov
e
rride
b
u
ilt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
l
a
r
gitk
:
Rename 'ta
g
con
t
ents'
t
o
'
cached_tagcont
e
nt'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread
r
eferenc
e
s"
t
o
rel
o
ad
t
ags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agui
l
ar
merg
e
tool,diffto
o
l: Document -
-
t
o
ol-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
ft
o
ol
:
D
isable --
s
ymlin
k
s on
c
ygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d
A
guilar
difftool: H
a
ndle com
p
are() retu
r
ning
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
di
f
ft
o
ol:
W
ra
p
long
lines for re
a
da
b
i
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
d
i
fftool
:
Check
all retur
n
c
o
des from com
p
are()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
d
i
f
ftool: Handle fi
n
d
ing m
e
rgetools/ in a
pa
t
h with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Agu
i
l
a
r
d
i
fftool: Use
s
ymlin
k
s
w
hen d
i
ffing against the
w
orktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
ool:
Cal
l
t
h
e temp directo
r
y
"git-
d
ifftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool
:
Move option va
l
ues into
a ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid
A
guilar
diffto
o
l: E
l
iminate global var
i
abl
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguila
r
d
i
fftool: Simpl
i
fy pri
n
t_tool_hel
p
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800:
Tes
t
dif
f
tool p
a
ssing
arguments
t
o diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
Aguilar
mergetool: Provide an empty f
i
le w
h
e
n
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d Aguilar
Make
f
ile: Improve compiler header depe
n
d
e
ncy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
mergetools/m
e
ld: Use '--
o
utput' wh
e
n
avai
l
abl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vi
d
Aguilar
mergetool--lib: Ref
a
ctor tools
into separat
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetoo
l
-
-l
i
b: Mak
e
sty
l
e c
o
nsist
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difft
o
ol--hel
p
er: Ma
k
e st
y
l
e
consistent
with g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguila
r
t/t7503
-
p
re-commit-hook
.
sh: Add GIT_P
R
EFIX test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Ag
u
ila
r
gi
t
-mergetool-
-
li
b
: M
a
ke vimdiff
r
etai
n
the c
u
rre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguila
r
g
it: Rem
o
ve
h
and
l
ing for
G
IT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
se
t
u
p
: Provide
G
IT_PRE
F
IX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David A
g
uilar
submo
d
ule sync: U
p
date
"
subm
o
d
ule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
er
g
e
t
ool: Skip a
u
toresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
D
o
c
u
mentation: Ex
p
lain git-mergeto
o
l's use of t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Aguilar
Makefile: R
e
move usage o
f
depre
c
at
e
d Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguilar
di
f
ftool: Fix
'
--gui'
when d
i
ff
.
guitool is un
c
onfigu
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Agu
i
l
a
r
t780
0
-
difftool
.
s
h
:
Tes
t
merge
t
ool
.
pr
o
mp
t
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d Aguil
a
r
d
i
ff
t
o
o
l
:
Update c
o
p
yright notices to list ea
c
h
y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Agui
l
ar
diff
t
ool: Us
e
eval
t
o
expand '-
-
extcmd'
ex
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
difft
o
ol: Add '-x' and
as
a
n a
l
ia
s
for '--ext
c
md'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Agui
l
ar
t
7
800-difftool
.
sh: S
i
mplify the
--extcm
d
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
git-diff
.
tx
t
: Link to
g
it-d
i
fft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool:
All
o
w specifyi
n
g
u
nconfig
u
red
com
m
ands
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
d
i
fft
o
o
l--
h
elp
e
r: Remove us
e
of
the GIT_MER
G
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--helper: Updat
e
copyrigh
t
and re
m
ove
d
istrac
t
in
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
git
-
difftool
:
Add
'--gui
'
for
s
electing a GUI to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguil
a
r
t7800-difftool: Set a bogus t
o
ol
for us
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not
u
n
n
e
cessarily look for
a
re
p
o
s
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid Aguilar
subm
o
dul
e
.
c: Squelch a "use before assignment" warnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff:
g
ener
a
te pretty filenam
e
s in pr
e
p_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agui
l
ar
compat: add a base
n
ame() comp
a
ti
b
ility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
com
p
at: a
d
d
a
mks
t
emp
s
() compati
b
ility funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
A
d
d git-repl
a
ce to
.
gitigno
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d
A
g
uilar
m
erg
e
tool--lib:
add support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
gui
l
ar
mergetool--lib: specia
l
ize diff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merg
e
t
o
ol--lib: simplif
y
API us
a
ge by removing
m
ore
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
f
tool
/
mergetoo
l
:
r
e
f
actor commands
t
o
use
g
it
-
m
ergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
m
e
rge
t
ool: use
$(
.
.
.
)
i
n
stead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
bas
h
completion:
a
dd git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
diff
t
ool: ad
d
s
u
ppo
r
t
f
o
r
a
difftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool: add var
i
ou
s
git-difftoo
l
te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
i
lar
difftoo
l
: move
'
git-difft
o
ol' out o
f
c
o
n
tr
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
difftool:
add a
-y shortcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difft
o
o
l
: use perl built-i
n
s
w
hen testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
u
ila
r
difftool: remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
di
f
ft
o
o
l: remove merge options for o
p
endif
f
,
t
k
di
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
u
i
lar
e
veryday: use the dashless
f
o
r
m
o
f git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David A
g
uilar
contrib/
d
iff
t
ool:
use a
se
p
a
r
a
te conf
i
g
namespac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Ag
u
ilar
contr
i
b
/
difftool: Don'
t
rep
e
at m
e
rge
tool
candi
d
a
tes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
tool:
p
ut
t
he cursor on
t
h
e editable
f
ile for
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguilar
difftoo
l
: f
i
x documen
t
ation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Aguilar
cont
r
ib: add '
g
i
t
difftool' for launching commo
n
me
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool:
pro
p
erly handle "git
m
ergetool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d Aguilar
te
s
ts: add a testcase for "g
i
t submod
u
le
s
y
nc"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
v
i
d Aguilar
g
i
t-s
u
b
m
odule: add
"
sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
avid Aguila
r
git-subm
o
d
u
l
e
: replace duplicat
e
d c
o
d
e w
i
th
a
module_l
i
st
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid
Agui
l
ar
[PA
T
CH] gitk: Don't show local cha
n
ges
w
hen we
t
h
ere
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree