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
debian: new upstream release
2022-01-16
D
a
vid Aguilar
build: centos/RH
E
L
7 ships with an olde
r
gcc a
n
d zlib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-13
Davi
d
Aguilar
mergetools/xxdiff
:
prevent segfault
s
from
s
topping
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Aguilar
di
f
ftool: add a
m
issing space
t
o
t
h
e run_dir_diff(
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
D
avid
A
guilar
dif
f
tool:
r
emo
v
e an unn
e
cessa
r
y cal
l
to st
r
buf_r
e
leas
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Aguilar
difftool: refactor dir-diff to write fi
l
es u
s
ing hel
p
er
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
Da
v
id Aguilar
difftool: create a tmpdir path without repea
t
ed sl
a
shes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-09-23
Dav
i
d Ag
u
ilar
d
i
fftoo
l
: fix symlink-file w
r
iti
n
g
in dir-d
i
ff
m
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
Dav
i
d Aguil
a
r
con
t
rib/completio
n
:
f
i
x
zs
h
completi
o
n regression f
r
o
m
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Dav
i
d Aguilar
git-gui
:
ssh-a
s
kpa
s
s: add a checkbox
to sh
o
w the inpu
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
Da
v
id Aguilar
contrib/comple
t
ion: add
s
mer
g
e to the
m
ergetool com
p
letion
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
David
Aguila
r
merge
t
ools: add su
p
po
r
t for s
m
erge (S
u
blim
e
Merge)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-06-19
Da
v
id Aguilar
mer
g
etools/meld:
i
mprove com
p
ati
b
iil
t
y with Meld on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguila
r
difftool: handle modified symlinks in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguila
r
t7800:
c
leanup
c
r
uft l
e
ft behi
n
d by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguila
r
t7800: remove whitespace befo
r
e r
e
direct
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t7800: replace "w
c
-l"
w
ith test_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Ag
u
i
lar
t7800: sim
p
lify basic usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Aguilar
difftool: fix
b
ug when printing usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
D
avid Agu
i
l
a
r
gitk: Remove tran
s
lated message
from c
o
m
m
en
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid Aguilar
mergeto
o
ls: fix xxdiff h
o
t
keys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Davi
d
Agu
i
l
a
r
dif
f
t
o
ol: ren
a
me
v
ariables for co
n
sist
e
ncy
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Da
v
id Aguilar
difftoo
l
: chdir as e
a
rly as possi
b
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Agui
l
ar
d
ifftoo
l
: sanitize $
w
orkdir as early as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid Ag
u
ilar
difftoo
l
: f
i
x
d
ir-di
f
f index creation wh
e
n in
a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Davi
d
Aguilar
difftool: fix dir-diff index crea
t
ion when in
a subd
i
rectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
a
vid
A
g
u
ilar
me
r
geto
o
ls/vimdif
f
: trus
t
Vi
m
's exit
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergetoo
l
: honor mergetool
.
$t
o
ol
.
trustExit
C
o
d
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: honor -
O
<
ord
e
rfi
l
e>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David A
g
ui
l
ar
mergetool: honor diff
.
o
r
derFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid Aguilar
mergetool
:
move main program flow into
a
main() functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
ergetool:
add
c
opyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
i
d Ag
u
i
lar
difftoo
l
:
use Git:
:
* func
t
ions instead
of
pas
s
ing
around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: avoid $GIT_DIR and $
G
IT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Ag
u
i
lar
subtree: adjust function defini
t
i
o
ns to match CodingGui
d
elines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguil
a
r
subtree:
adju
s
t style to match
C
o
dingGu
i
delines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Agu
i
lar
subtr
e
e
:
f
i
x "git
subtre
e
split --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
avid Aguilar
t7900-subt
r
ee
.
sh: fix quoti
n
g a
n
d broke
n
&
& chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David A
g
ui
l
ar
difftool: hand
l
e unmer
g
ed files in dir-
d
i
f
f mod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
A
guilar
difftool
:
i
nitialize variables for read
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avi
d
A
g
uil
a
r
m
e
rgetool: h
o
n
or
t
empfile configuration when
r
esol
v
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Da
v
id Ag
u
il
a
r
mergetool: sup
p
o
rt delet
e
/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Dav
i
d
A
guilar
d
i
fftool: ignore s
y
m
b
olic
l
i
nks in
u
se_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
c
ontrib
/
subtree: ignor
e
l
og
.
date configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
avid
A
guilar
mer
g
et
o
o
ls: add winmerge
as a b
u
i
ltin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mer
g
etool--
l
ib: set IFS
f
or d
i
fftool and me
r
geto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David A
g
uilar
mergetool
s
:
st
o
p
setting
$
s
t
a
tus in
m
erge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool: simplify c
o
nditi
o
nals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
i
d
Aguilar
d
i
ff
t
ool-
-
h
e
lper
:
add expl
i
cit e
x
it statem
e
nt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguilar
m
e
rgetool--lib: remove use of $
s
t
a
tus
g
l
obal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Dav
i
d Aguilar
di
f
ftool: honor
--tru
s
t-
e
xit-code
f
or
builtin to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Da
v
i
d Aguilar
difftool: ad
d
support
f
or --trust-e
x
it-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
t7
6
1
0
-me
r
getool: add test cases for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
i
lar
m
ergetool: add
an opti
o
n for writing to a temp
o
rar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mer
g
e
tool: use
m
ore conservative t
e
mporary f
i
lenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
A
g
uilar
t
est-
l
i
b
-functions: adj
u
st style to match Coding
G
ui
d
e
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7
6
1
0-mergetool: use
test_c
o
n
f
ig to
i
solate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
mergetools/meld:
m
ake usage of `--output` conf
i
g
urable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
l
a
r
git-sh-setu
p
: move GI
T
_DIR
initial
i
zati
o
n
i
n
to a funct
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
me
r
getool: use more co
n
servative
t
emporary
fi
l
enames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t
e
st-lib-functions: ad
j
ust style t
o
match CodingGu
i
del
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-merge
t
o
o
l: p
r
efer test_config
over git
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguil
a
r
t
7
610-m
e
rg
e
tool: add missing && and
rem
o
ve c
o
mmented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
A
guilar
t76
1
0-mergetool: use
t
a
bs instead
of a mix of ta
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguil
a
r
completion: add --sho
w
-
signatur
e
for log and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stas
h
: prefer
-
-quie
t
over shell redire
c
t
i
on of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
refs:
make rev-par
s
e
--
q
uiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: use
test_must_be
_
empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Doc
u
m
e
ntation: a not
e
about
s
tdout for g
i
t re
v
-par
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
clean
u
p
s
: ensure t
h
at git-compat
-
util
.
h is inc
l
uded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
a
vid Aguilar
s
t
y
lef
i
x: ast
e
r
i
s
ks stic
k
to the v
a
riable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David
Aguilar
gitk: Catch mkd
t
emp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Agui
l
ar
gitk: Use mktemp -d to avoid
p
redictable te
m
porar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
g
uilar
gitk
:
H
o
nor TMP
D
IR when viewing exte
r
n
a
l
diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difftool: support reposi
t
ories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
ilar
pull: add
--
f
f-
o
n
ly to th
e
help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid Ag
u
ilar
p
ull: add pull
.
ff
c
onfiguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Ag
u
ilar
imap-send:
e
l
i
mina
t
e
H
MAC d
e
precation warning
s
on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Ag
u
i
l
a
r
cac
h
e
.
h
:
eliminate SHA-1 depre
c
at
i
on warni
n
gs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
Ma
k
efi
l
e: ad
d
suppor
t
for A
p
ple CommonCrypto facilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Ag
u
i
l
ar
Makefile:
fix
default reg
e
x settings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
avid Aguilar
m
erget
o
ols/kdiff3:
d
o no
t
u
se
-
-auto
when diff
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: add a compatibility comment
to cmd_ve
r
s
ion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
cont
r
ib/mw
-
to-g
i
t/t/install-wik
i
.
sh:
u
se
a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
contrib/examples/git-re
m
ote
.
per
l
: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Agu
i
lar
test
s
: use a lowercase "us
a
ge:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid A
g
uil
a
r
git-svn: use a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Doc
u
m
entatio
n
/
user-manual
.
t
x
t: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
lar
template
s
/hooks--update
.
s
a
m
pl
e
: use a
lowe
r
case "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
cont
r
ib
/
h
ooks/setgit
p
erms
.
perl: u
s
e a
lowercase
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
con
t
rib/exampl
e
s: use a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
uilar
contrib/fas
t
-import/import-zips
.
py: use s
p
aces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
l
ar
contrib/fa
s
t-import/import-zips
.
p
y: fix br
o
ken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib/fas
t
-import: use a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
c
ont
r
ib/cr
e
dential:
u
se
a
l
o
wercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-cvsimport: use a low
e
rcase "usag
e
:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Agui
l
ar
g
i
t
-cvsimport: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
g
it-cvsexpo
r
tcommit
:
use a
l
owercas
e
"us
a
ge:
"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-arc
h
import: use a lo
w
ercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Agu
i
lar
g
i
t-m
e
rge-one-f
i
l
e
:
use a lowerca
s
e "usage
:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
guilar
g
it-relink: use a
l
owercase "u
s
a
ge:"
s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next