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
add: ignore only ignored files
2014-11-14
Dav
i
d Aguilar
d
i
fftool: honor --tru
s
t-
e
xit-code for
bui
l
t
i
n tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguila
r
d
i
ff
t
ool: add
support for --
t
r
ust-e
x
it-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
A
guilar
t7610-mergetool: add test cases for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
me
r
geto
o
l: add an option for
w
ri
t
ing t
o
a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
m
e
r
g
etool: use
m
ore co
n
servative
temporary filenam
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-lib-funct
i
on
s
:
ad
j
ust style t
o
match
C
odingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-
m
e
rgetool:
u
se test_config to i
s
o
l
ate tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
me
r
getools/meld: make u
s
a
g
e
o
f `--output` configu
r
a
b
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-
s
h-setup: move GIT_DIR init
i
al
i
z
ation into
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merget
o
ol:
use
m
ore con
s
ervative
t
empor
a
ry f
i
lenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-lib-functi
o
ns
:
adjust style to match CodingGui
d
e
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
A
g
u
i
lar
t7610-
m
er
g
etoo
l
: pr
e
fer te
s
t_config over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguil
a
r
t7610-
m
ergetool
:
add mis
s
i
n
g
&
& and remove c
o
mmented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
a
r
t76
1
0-mergetool: use tabs i
n
stead of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
complet
i
on: add
--show-signature for
l
o
g
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d Aguilar
sta
s
h: prefer --quiet over shell redirect
i
o
n
of th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguilar
ref
s
: mak
e
rev
-
pars
e
--qu
i
et
actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t15
0
3
:
us
e
test_must_be
_
e
mpt
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Do
c
umentat
i
on: a
n
ote about stdout for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid Agu
i
lar
cleanups
:
ensure
that git-compat-ut
i
l
.
h is i
n
cluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David
Aguilar
s
t
y
l
efix: asterisks stick to t
h
e variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Agui
l
ar
gitk: Cat
c
h mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d Aguilar
gitk: Use mktemp -d to avoid predi
c
table temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid
A
guilar
gitk: Honor TMPDIR
w
hen viewing e
x
te
r
nal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
a
vid Aguilar
difftoo
l
: support reposit
o
ries with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d Aguila
r
p
u
l
l: add --ff-only to the
h
elp text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avi
d
Aguilar
pull: a
d
d pull
.
ff confi
g
u
r
at
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d
Aguilar
i
m
ap
-
se
n
d:
elim
i
nate HMAC
deprecation w
a
rnings on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: elimi
n
ate SHA-
1
deprecation warning
s
on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add support f
o
r Apple CommonCryp
t
o f
a
cility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
a
vid
A
guilar
Ma
k
efile
:
f
i
x default r
e
g
e
x settings on
D
arwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
a
v
i
d Aguilar
mergeto
o
ls/kd
i
f
f
3: do not
use --a
u
to whe
n
d
iffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
v
id Agui
l
ar
help
.
c
: add a
compatibility c
o
mment to c
m
d_ver
s
i
on(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
av
i
d Aguilar
contrib/mw-to-git/t/ins
t
all-w
i
ki
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Agui
l
ar
contrib/examples/gi
t
-remo
t
e
.
perl: use a lowercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use a lowercase "usa
g
e:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
git-svn:
u
se a lowercase "
u
sa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
Docum
e
ntation/us
e
r
-manual
.
tx
t
: use
a l
o
werca
s
e "us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templates/ho
o
ks-
-
update
.
sample: use a
l
owercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/hooks/setgitperms
.
perl: use
a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contri
b
/example
s
: use a l
o
wercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
co
n
trib/fast-import/import-zi
p
s
.
py: use spaces ins
t
e
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
co
n
trib/fas
t
-import/impor
t
-z
i
p
s
.
py: fix broken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
co
n
trib/fast-i
m
port:
u
se a lowerca
s
e
"
usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/credential: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-c
v
simport:
u
se
a
l
o
wercase "
u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
ar
gi
t
-cvsimport: use a low
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
g
u
ilar
git-cvsexportcommit
:
use a lowercas
e
"u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-archimport: use
a
l
o
wercase "usage
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
git-me
r
g
e-one-file: use a lowercase "
u
sage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
g
uilar
g
i
t-relink:
u
se a low
e
rca
s
e
"usag
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a lowercas
e
"usage
:
" s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git
-
s
h
-se
t
up: use a
l
o
wercase "
u
sag
e
:
"
s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Agu
i
lar
t780
0
: "defaul
t
s
"
is no
longer a built
i
n tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
il
a
r
t
7
8
00
:
modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
Aguilar
t7
8
00: update copyrig
h
t notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Agui
l
ar
difftool: silence uninitialized variab
l
e warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
u
ilar
p
4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool
-
-helper: f
i
x
printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d
A
g
uila
r
d
o
c: gene
r
ate a li
s
t of
v
alid me
r
g
e t
o
o
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Agui
l
a
r
m
e
rgetool--lib: add functions for
f
i
n
d
i
ng av
a
ilab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
merget
o
ol--lib:
improve t
h
e he
l
p text
in gue
s
s_merge
_
tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguilar
mer
g
etool--lib: simpl
i
fy command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Agu
i
lar
me
r
getools: simplify h
o
w
we
h
and
l
e "vim"
a
nd "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
mergetool
-
-lib:
improve sh
o
w_t
o
ol_h
e
l
p
() outp
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avi
d
Aguila
r
merget
o
ols/vim: remove redunda
n
t d
i
ff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguila
r
mergetools/p4merge: Honor $
T
MPDIR f
o
r the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David A
g
uila
r
mer
g
eto
o
ls
/
p4merge: Hand
l
e
"
/dev/nu
l
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Agui
l
ar
me
r
getool--
l
ib: A
l
low
c
ustom
commands to
o
ver
r
ide built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rename 'tagco
n
t
e
nts' t
o
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk: Teach "Reread reference
s
" t
o
reload t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguilar
m
ergetool,di
f
ftool: Document
-
-tool-help co
n
sistent
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
di
f
ftool: Disable --symlinks on cyg
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
di
f
ftool: Handle compare()
r
e
turnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
d
ifftool: Wrap lon
g
line
s
for
r
ead
a
bilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool
:
Check all ret
u
rn
c
odes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agui
l
a
r
difftool: Handle finding
mergetool
s
/
in a path w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
ifftool: Use symlinks when diffing agai
n
st the wor
k
tree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguilar
dif
f
tool: Call the
temp directory "git-
d
if
f
tool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Agu
i
lar
difftool:
M
o
ve opt
i
o
n
values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eliminate global vari
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
dif
f
tool: Simplify print_to
o
l_help(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
guil
a
r
t7800: T
e
st d
i
ffto
o
l
p
a
ssing a
r
g
uments to
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David A
g
uilar
mer
g
etool
:
P
r
o
v
i
d
e
a
n empt
y
file
w
hen n
e
ed
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agui
l
ar
Makefile: I
m
prov
e
co
m
piler
h
eader dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
m
e
rgetools/meld: Use '--ou
t
put' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mer
g
etool-
-
li
b
: Refactor tools into sepa
r
ate
f
i
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
m
e
rgetool--lib: Make
s
t
yle cons
i
stent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguila
r
difftool--helper: Make
style con
s
istent w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-co
m
mit
-
hook
.
sh: Add
GIT_PREFIX
tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
g
i
t
-m
e
rgetool--lib: Make vi
m
diff reta
i
n the cur
r
ent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git: Remove h
a
ndling
for GIT_
P
RE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguilar
setup: Provide GIT_PREFIX to built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguila
r
s
ubmo
d
u
le s
y
nc: Upd
a
te "su
b
mod
u
le
.
<na
m
e>
.
u
rl
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agu
i
l
ar
merge
t
ool: Ski
p
autoresolv
e
d p
a
ths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id
A
gu
i
lar
Documentation
:
E
x
pl
a
in g
i
t-mergetool's use of tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Mak
e
file:
R
em
o
ve usage
o
f
deprecated
Python
"
ha
s
_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
Aguilar
diff
t
ool
:
F
i
x '--
g
u
i
' when diff
.
guitool is unconfi
g
u
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7
8
00-difftoo
l
.
sh: Test mergetool
.
pr
o
mp
t
fal
l
back
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Agui
l
ar
d
ifftool: Update
c
opyri
g
ht
n
otices to list
e
ach ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next