repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "display HTML in default browser using Windows' shell API"
2016-05-16
D
a
v
i
d
Aguilar
difftool: handle unmerge
d
files i
n
d
ir-dif
f
m
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id Aguilar
difftool
:
initial
i
z
e variables f
o
r readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vid Aguil
a
r
mergetool: honor tempfile configurat
i
on
w
hen res
o
lv
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avid Aguilar
merg
e
tool: su
p
p
o
rt delete/delete conflic
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
D
av
i
d
Aguilar
difftool: ignore symbo
l
ic links in us
e
_
w
t_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Da
v
id Aguilar
contrib/subtr
e
e: ignore log
.
date
c
on
f
iguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mer
g
etools: add w
i
n
m
e
r
ge as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Davi
d
Aguil
a
r
mergetool--lib
:
set IFS for difftool and
m
e
rgetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
gu
i
lar
m
e
rget
o
ols: stop
setti
n
g
$st
a
tus in m
e
rg
e
_
c
md(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguilar
mergetool: sim
p
li
f
y condi
t
i
o
nals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
difftool--helper: add explicit e
x
it
sta
t
ement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Aguilar
merg
e
tool-
-
l
ib: remove use o
f
$
s
tatus gl
o
ba
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
di
f
f
tool: honor --
t
rust-e
x
i
t
-
code
f
o
r builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
difftool: add supp
o
rt f
o
r
--trust
-
exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
t7610-merg
e
t
ool: add test ca
s
es for
m
e
r
geto
o
l
.
writ
e
T
oTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguil
a
r
me
r
g
et
o
ol:
a
dd an option f
o
r writing
to a
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
m
e
rget
o
ol:
u
s
e
more conservative te
m
porary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
e
st-lib-f
u
ncti
o
n
s
: a
d
j
u
s
t s
t
yle to match CodingGuid
e
lines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool
:
use test_co
n
fig to iso
l
ate
te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
merg
e
t
ools/meld: make usage of `--output
`
c
o
nfigurab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
A
g
u
ilar
git-sh
-
setup:
m
ove GIT
_
DIR initializati
o
n into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merge
t
ool
:
u
se
m
ore
conservative
t
em
p
o
rary fi
l
enames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
test-l
i
b-fu
n
ctions: adjust
s
t
yle to match
C
odingGui
d
elines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guila
r
t
7610-mergetool: prefer test
_
config ove
r
git confi
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610-me
r
getool:
add mi
s
sing && and remove com
m
ented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-m
e
rgetool: use tabs instead o
f
a mix of
t
abs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
D
a
vid Aguilar
comple
t
ion: add --show-sig
n
ature for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avid Aguilar
st
a
s
h
:
prefer -
-
quiet over shell
r
edirec
t
i
on of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguilar
ref
s
: make rev-parse --quiet actually
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguila
r
t1503: use t
e
s
t_must_be_
e
mpty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Davi
d
Aguilar
Documentation
:
a note about
stdou
t
for git rev
-
parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Ag
u
i
lar
cleanups: e
n
sure that git-compat-u
t
il
.
h i
s
include
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
avi
d
A
guilar
stylefix
:
asteri
s
ks stick
t
o the v
a
riable, n
o
t t
h
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David A
g
u
i
lar
g
i
tk: Catch mkdte
m
p errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
guilar
gitk: Use m
k
temp -d to avoi
d
predi
c
table temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
uilar
gitk:
Honor TMPDIR whe
n
vi
e
wing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Da
v
id Aguilar
d
i
fft
o
ol: support reposi
t
ories with
.
g
i
t-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add -
-
ff-onl
y
to th
e
h
elp
t
ex
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid
Aguilar
p
u
ll: add pull
.
f
f configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
ima
p
-send: eliminate HMAC depreca
t
i
o
n
w
arnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h
:
e
liminate S
H
A-1 depr
e
cat
i
on warnings on Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
uilar
M
a
kefile: ad
d
support for A
p
ple Co
m
m
o
nCrypto
faci
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David
A
g
uilar
Makefile: fix default reg
e
x setti
n
gs on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David
Aguilar
me
r
get
o
ol
s
/
k
d
i
ff3: do
not use --
a
uto wh
e
n diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id Ag
u
ilar
help
.
c: add
a compa
t
i
b
i
lity comm
e
nt to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid
A
g
uilar
c
ontrib/mw-t
o
-
g
it/t
/
install-wi
k
i
.
sh: use
a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agui
l
ar
contri
b
/examp
l
e
s
/gi
t
-
r
em
o
t
e
.
p
e
rl: use
a lowe
r
cas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
t
e
sts:
use a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id
Aguilar
git-svn: u
s
e
a
lowe
r
ca
s
e
"
usage:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Documentation/use
r
-manu
a
l
.
t
x
t
:
use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
g
uilar
t
e
mplat
e
s
/hooks--update
.
sam
p
le: use a lowercas
e
"us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
con
t
rib/hooks/setgitperms
.
perl:
use a lower
c
a
se
"usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contri
b
/e
x
amples: use
a
lowercase "usage:"
s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contrib
/
fast-im
p
ort/import-z
i
ps
.
p
y
: use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
c
o
n
trib/fast-impo
r
t/
i
mport-zips
.
p
y
: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
ar
contrib/fast-import: use
a
lowercase "usag
e
:"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
ri
b
/
cr
e
dent
i
a
l
:
use a
l
o
werc
a
se "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-c
v
simport: u
s
e a low
e
rca
s
e
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
git-cvsimport: use a lowerca
s
e "u
s
a
ge:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
ilar
g
it-cvsex
p
ortc
o
mmit: use a lowerc
a
s
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-archimp
o
rt
:
use a lowercase "usag
e
:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-me
r
ge-on
e
-file: use a lowercase "us
a
ge
:
"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-r
e
link: use a lowerc
a
se "usag
e
:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: u
s
e
a lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
g
it-s
h
-setup:
u
se a lowerc
a
se "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Agu
i
lar
t7800: "defaults" is no lon
g
er a builtin
t
o
ol
n
ame
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t780
0
: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Dav
i
d Aguilar
t780
0
: upd
a
te copyri
g
ht n
o
tice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
avid
A
gu
i
lar
dif
f
tool: silence uninitiali
z
ed variab
l
e warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguil
a
r
p4merge: fix
p
r
i
ntf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Agui
l
ar
difftool--helper: f
i
x printf
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agui
l
a
r
doc: gene
r
ate a li
s
t of v
a
li
d
merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
g
uilar
m
ergetool--li
b
:
add functions for
f
inding a
v
ailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
mergetoo
l
-
-
lib: improve t
h
e help t
e
xt in gues
s
_
m
erge
_
tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Agu
i
la
r
m
ergetool--lib: s
i
mpli
f
y comm
a
nd expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mer
g
etools: simp
l
ify how we handle "vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
mergetool--
l
ib: improve show_to
o
l_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
m
e
r
g
e
tools/vim: remove red
u
ndant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/p4merge: Ho
n
or $
T
MPDIR for the /d
e
v/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
merget
o
ols/
p
4merge: Handle "/dev/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
v
i
d Aguilar
mergetool--lib
:
Allow custom commands to
o
ve
r
ride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
u
ilar
gitk: Rename 't
a
gconte
n
ts'
t
o
'
c
ach
e
d_t
a
gc
o
ntent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread ref
e
r
ences"
to reloa
d
tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
m
ergetoo
l
,diff
t
ool: Do
c
ume
n
t --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: Disable --symlinks on cyg
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftoo
l
: H
a
ndle compare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fftool: Wrap long lines for re
a
dabil
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
di
f
ftool: Check
a
ll return codes from compa
r
e()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
gu
i
l
a
r
d
i
fftool: Handle find
i
ng mergetools/ in a p
a
th wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Ag
u
ilar
difft
o
ol: Use sym
l
i
n
ks
w
h
en diffing again
s
t
t
he worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
ff
t
o
o
l: Call th
e
tem
p
d
i
rec
t
ory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftoo
l
: Move opt
i
on v
a
lues into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool: Elimin
a
te g
l
o
bal variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool
:
Sim
p
lify print_
t
ool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
gui
l
ar
t
7
800
:
Test difftool passing arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Dav
i
d Aguilar
merg
e
t
oo
l
: Pro
v
ide an empty
file wh
e
n needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Agu
i
lar
Makefile: I
m
p
rove compiler head
e
r dep
e
n
d
e
ncy
check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
merge
t
ools/meld: Use
'
--output' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
m
e
rgetool--lib: Refact
o
r
t
ools into
s
e
parate file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agui
l
ar
merget
o
ol--lib: Make s
t
yle
c
onsis
t
e
nt w
i
th
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next