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
Merge branch 'jc/push-cert'
2014-10-16
D
a
vid A
g
uilar
t7
6
1
0
-mergetool: add t
e
s
t cases for me
r
getool
.
w
r
i
teToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
mergetoo
l
: add an option fo
r
writing t
o
a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
me
r
getool: us
e
more con
s
e
r
vati
v
e temporary fi
l
enames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
t
e
st
-
li
b
-fun
c
tions: adjust st
y
le to ma
t
c
h Co
d
in
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
t
7
61
0
-mer
g
etool: use te
s
t_config
to
isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
Agu
i
lar
mergetools/meld: mak
e
usage of `--out
p
ut` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Agui
l
a
r
git
-
sh-setup: move
G
IT_DIR initi
a
liza
t
ion into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Agu
i
l
a
r
merget
o
ol: use more conservative
t
emporary filen
a
mes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id A
g
uilar
te
s
t-lib
-
functions: adju
s
t style to m
a
tch Codi
n
gGuide
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Ag
u
ilar
t7610-
m
er
g
etool: prefer test_config over
g
it config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Ag
u
ilar
t7610-merg
e
t
o
o
l: add
missing
&
& and remove com
m
ent
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-mergeto
o
l: us
e
tabs instead of a
m
i
x of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Agui
l
ar
completion:
a
dd --show
-
signature
for
log and s
h
ow
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d Agu
i
lar
stash:
p
r
efe
r
--q
u
i
e
t o
v
er s
h
ell
r
edirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avid Aguilar
r
e
fs: make rev-parse --qu
i
et
actually quie
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David
A
guilar
t15
0
3
:
u
s
e t
e
st_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentation: a note abo
u
t s
t
d
out
fo
r
gi
t
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-u
t
i
l
.
h is
i
ncluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Da
v
id Aguilar
s
t
y
le
f
ix: asterisks stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
a
v
id Aguil
a
r
gitk: Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
uilar
git
k
:
Use mktemp -d
t
o avoid
p
redicta
b
le temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d Aguila
r
git
k
:
H
o
nor TMPDIR when viewing exter
n
al dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
dif
f
tool: support
r
e
positorie
s
w
ith
.
git-f
i
le
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id A
g
uilar
p
u
ll: add --ff-o
n
l
y to
the
h
elp
t
ex
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguil
a
r
pull: a
d
d
p
u
l
l
.
ff configu
r
a
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David
Ag
u
i
l
ar
i
map-send:
el
i
minate HMAC
d
eprecation war
n
ings
o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguilar
cache
.
h:
eliminate SHA
-
1
deprecation war
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Ag
u
ilar
Make
f
ile: add support
for App
l
e C
o
mmo
n
Crypto faci
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefile: fix default regex sett
i
ngs o
n
D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguila
r
merg
e
too
l
s/kdiff3:
d
o not
u
s
e
--auto
w
hen diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
Aguilar
help
.
c:
add a compa
t
i
bil
i
t
y
comm
e
nt to cmd_v
e
rsion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw
-
to
-
git/
t
/
i
nstall-wiki
.
s
h
: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id A
g
uilar
c
ontrib/examples
/
git-r
e
mote
.
perl: use a lowercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests:
u
se a low
e
rcase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid
Agu
i
lar
gi
t
-svn: use a
lo
w
er
c
as
e
"usa
g
e:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
Documentation/user-ma
n
ual
.
txt: use
a
lowercase "us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
template
s
/
h
ooks--update
.
sam
p
le: use a lowercase "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguil
a
r
c
o
ntrib/
h
ooks/setgitpe
r
ms
.
perl: use a lower
c
as
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
contri
b
/examples
:
use
a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
a
r
contri
b
/fast-impor
t
/im
p
ort-zips
.
py: use s
p
ac
e
s
i
n
stea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
c
o
ntrib
/
fast-import/
i
mport
-
z
ip
s
.
py: fi
x
b
roken erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
f
ast-import: use
a
l
o
w
e
rcase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
on
t
rib/cred
e
nt
i
al: use
a
l
owercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git
-
cv
s
i
m
port: use a lowerc
a
s
e
"
u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uil
a
r
git-cvsimpor
t
: use a lowercase "usage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-cvsexportcommit: use a lowerca
s
e
"usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archi
m
port: use a lowercase "
u
s
a
g
e:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
g
i
t-merg
e
-one-file: use a lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d A
g
u
ilar
git-relink: use
a
lowerca
s
e "usage:" s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it
-
s
v
n
:
use a
lowercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-sh-setup
:
use
a low
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
av
i
d Aguilar
t
7800: "d
e
faults" is no long
e
r
a
builtin too
l
nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Aguil
a
r
t
7
800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Da
v
id Aguilar
t7
8
0
0
: update
copyr
i
ght
n
otice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Agu
i
lar
di
f
ftool: silence uniniti
a
lized
v
ariable warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
p4merge: fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
d
i
fftool--hel
p
er: fix
p
rintf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d Agui
l
ar
do
c
: generate a list
o
f valid
merg
e
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--l
i
b: a
d
d funct
i
on
s
for fin
d
i
n
g a
v
ailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id
A
g
u
ilar
mergeto
o
l--lib
:
impro
v
e the
h
elp text in guess_merge_too
l
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
m
ergeto
o
l
-
-lib: simplify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d
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
D
a
vid Agu
i
lar
merg
e
tool--l
i
b: impr
o
ve show_tool_h
e
l
p
()
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
me
r
getools/vim: remove re
d
un
d
ant diff
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
i
d Aguilar
mergetool
s
/p4merge: Honor $TMPDIR for the
/
dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David
A
guilar
m
e
rgetools/p4mer
g
e: Handle "/de
v
/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
Aguil
a
r
m
ergetool
-
-lib: All
o
w cust
o
m co
m
mands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
i
d
A
g
uilar
gitk:
R
ename 'tag
c
o
ntents' to 'cached_tagcon
t
en
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
i
tk:
Teach "R
e
r
ead r
e
ference
s
" to relo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguila
r
mergetool
,
diffto
o
l: D
o
cum
e
n
t --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disab
l
e --symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
difftool: Handle c
o
mpare() re
t
urning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
difftool: Wrap l
o
ng li
n
es for re
a
d
ability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check all
r
eturn codes f
r
o
m compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diff
t
o
o
l: Ha
n
d
le
f
in
d
i
ng mergetools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlin
k
s
w
hen diffing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
diff
t
ool: Cal
l
the temp
directory
"git-dif
f
tool
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
d
i
fftool: M
o
ve optio
n
value
s
i
nto a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguila
r
difftool: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
diff
t
ool: Si
m
plify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vi
d
Ag
u
ilar
t78
0
0: Test di
f
ftool passing argumen
t
s to d
i
ff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid
Agu
i
lar
mergetool: Provide an empty
f
i
l
e
w
h
e
n n
e
eded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguil
a
r
Makefi
l
e
:
Im
p
ro
v
e compiler header depend
e
ncy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
me
r
ge
t
ools/meld:
U
s
e '
-
-ou
t
put' wh
e
n avail
a
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--
l
i
b: Refactor tools
i
n
to separate
f
i
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id A
g
uil
a
r
m
er
g
et
o
ol-
-
lib:
Make sty
l
e con
s
istent
w
i
t
h
g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--helper: Make s
t
yl
e
con
s
isten
t
wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
a
v
i
d Aguilar
t/t7503-pre-commit-hook
.
sh: Add GIT_PREFI
X
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git-mergetoo
l
--lib
:
Make vimd
i
ff retain th
e
cu
r
ren
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguil
a
r
g
it: Remove handling
f
o
r GIT
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d
Aguilar
setup
:
Provide GIT
_
PREFIX
to bu
i
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
A
g
uilar
submodule sync: Update "s
u
bmod
u
le
.
<
name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agui
l
a
r
mergetool: Skip
a
utoresolved pat
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d Aguilar
Document
a
t
i
on: Explain git-mergetool
'
s
u
se
of temp
o
rar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefi
l
e: Remove usage of deprecated Python "has_k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d A
g
u
i
lar
difft
o
ol: Fix '--gui' w
h
en
d
iff
.
guitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d Aguilar
t7800-d
i
fftool
.
sh:
T
est
m
erge
t
ool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
d
ifftool:
U
p
date
c
opyrig
h
t
notices to list
e
ach ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
gu
i
l
a
r
dif
f
tool:
Use eval to expand '--ex
t
cmd' ex
p
r
es
s
i
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
dif
f
t
ool:
A
dd '-x' and as an alias for '--ex
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next