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 'js/alias-early-config' into maint
2017-06-19
Da
v
id Aguilar
m
e
r
getools
/
m
e
ld
:
i
m
pr
o
ve compatib
i
ilty with
Meld
o
n
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David
Ag
u
ilar
difftool:
h
a
ndle
m
odifi
e
d sym
l
i
nk
s
in dir-di
f
f
m
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
t7800: c
l
eanup cruft
left behind by tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
D
a
vid Aguilar
t
7
800: remove whitespace before redirect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
Dav
i
d Agu
i
lar
t7800:
repl
a
ce "wc
-l
"
with test_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David
A
guilar
t
7
800: simplify ba
s
ic usage te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David A
g
uilar
d
i
f
fto
o
l:
f
ix bug
w
hen
p
r
intin
g
u
s
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Agui
l
ar
gitk:
Remove translated message from comme
n
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid
A
guila
r
merg
e
t
o
o
ls: fix xxd
i
ff hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Ag
u
ilar
diff
t
ool:
r
ena
m
e
variabl
e
s
f
or con
s
istency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: chdir as
e
arly as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid Ag
u
ila
r
difft
o
o
l
: s
a
n
itize $
w
orkd
i
r as early as possi
b
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid Aguilar
difftool: fix dir-d
i
ff
index creation wh
e
n
in a sub
d
irectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Dav
i
d Aguila
r
difftool: fix dir-dif
f
ind
e
x
c
reation when in a su
b
d
ir
e
ctory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
merg
e
t
o
o
l
s/vimdiff:
t
rus
t
Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Agu
i
lar
merg
e
tool: h
o
no
r
mergetool
.
$
t
ool
.
trustEx
i
tCode
f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agui
l
ar
merge
t
ool: honor -O<
o
r
d
erfi
l
e>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid A
g
uilar
mergetool: h
o
nor
diff
.
o
r
derFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agui
l
ar
merget
o
ol: move mai
n
prog
r
am flow into
a main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
merget
o
ol: ad
d
copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
diff
t
ool: u
s
e Git:
:
*
functio
n
s
instead o
f
passing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d A
g
uilar
dif
f
too
l
:
avoid $GIT
_
DIR
a
nd $GIT_
W
ORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Aguilar
subtr
e
e: ad
j
ust function defini
t
ions to ma
t
c
h Codin
g
G
u
ideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
a
vi
d
Agui
l
a
r
subtree: adjust
s
tyle to match C
o
dingGuidel
i
n
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtree
:
f
ix "g
i
t
subtree
split --rejo
i
n"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguil
a
r
t790
0
-su
b
t
ree
.
sh: fix quoting a
n
d
b
r
oken && chai
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difft
o
ol
:
ha
n
dle unmer
g
ed files in
d
ir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Agu
i
lar
difftool: initial
i
z
e
variables for readabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
Aguila
r
mergeto
o
l
:
hono
r
tempfile configuration when re
s
olving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David A
g
ui
l
ar
m
e
rgetoo
l
: supp
o
rt delete/delete
c
onflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David
A
g
u
ilar
d
ifftool:
i
gno
r
e
s
ymbolic
l
inks in u
s
e_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Agu
i
lar
contri
b
/subtree: ignore
l
og
.
date c
o
nfigur
a
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguil
a
r
mergetool
s
: add
winme
r
ge
as a bui
l
tin too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguil
a
r
mergetool
-
-lib: set IFS for diffto
o
l
a
n
d mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Agu
i
lar
mergetools: stop setting $status in merg
e
_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
lar
mergetool: simplify c
o
ndition
a
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguila
r
difftool--
h
elper: add explicit e
x
it stat
e
ment
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mer
g
etool--l
i
b: rem
o
ve
use
of $
s
tatus g
l
oba
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Dav
i
d Aguilar
d
i
fftool: hono
r
--trust
-
ex
i
t-code fo
r
built
i
n
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David
A
g
u
il
a
r
difft
o
ol: add
s
upport fo
r
-
-
trust-exit-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-me
r
g
e
tool: a
d
d
test cases for mergetool
.
writeToTem
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
me
r
getool: add an option for
w
ri
t
ing to a tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Agu
i
lar
m
e
rgetool
:
us
e
mor
e
c
o
n
se
r
vative tempo
r
a
r
y
file
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
te
s
t-lib-functions: a
d
just
s
ty
l
e to match CodingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: use test_c
o
nfig to
isolate
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid A
g
uilar
me
r
getools
/
meld: mak
e
usage
of `--output` configurabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-setup: move GIT_
D
IR ini
t
i
alization into a
functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguila
r
mergetool: use more co
n
servative temp
o
rary
f
ilenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
i
d
Aguila
r
test-lib-functions
:
adjust st
y
le to match
C
odingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
i
lar
t7610-mergetool: prefer test_config
o
ver git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
t7610-merge
t
ool: add m
i
ssing && and remove comm
e
nted
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
t7610-merget
o
ol: use tabs inst
e
ad of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
A
guilar
comp
l
eti
o
n: add
--show-signa
t
ure fo
r
log
a
nd
s
h
o
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash: prefer --qu
i
et over s
h
ell
redirection of
t
h
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguila
r
refs: ma
k
e
r
ev-parse --quiet actual
l
y
qu
i
et
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David A
g
u
ilar
t
1503: use test_m
u
st_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documenta
t
ion: a note about stdout for
git rev-p
a
rse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
clea
n
ups
:
en
s
ure
t
hat git-compat-util
.
h
i
s
i
ncluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix: aste
r
isks s
t
ick to the vari
a
ble,
n
ot the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
avid Ag
u
ilar
gi
t
k: Catch mkdt
e
mp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
gitk: Use mktemp
-
d
to avoid predictable
t
emporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor T
M
PD
I
R w
h
en vi
e
win
g
e
xternal dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguil
a
r
difftool: sup
p
ort rep
o
sitori
e
s wit
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d Agu
i
lar
pu
l
l: add -
-
ff
-
only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pul
l
: add p
u
ll
.
ff
c
onfi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Agui
l
ar
imap-
s
end: eliminate HMAC
deprec
a
tion warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguilar
cache
.
h: e
l
iminate SHA-1 deprec
a
tion
w
arnings on Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Agui
l
a
r
Makefile
:
add support for A
p
ple CommonC
r
ypto f
a
cility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Ma
k
efi
l
e:
fix
d
efault regex
setti
n
g
s on Dar
w
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Agui
l
ar
mergetool
s
/kdiff3
:
do not
u
s
e
--au
t
o w
h
e
n diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: add
a
c
ompatibil
i
ty com
m
ent t
o
cmd
_
version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
co
n
trib/mw-to-git/t/install-w
i
k
i
.
sh: use a
l
owe
r
c
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
contrib/examples/
g
i
t
-remote
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
i
d
Aguil
a
r
tests: us
e
a lowerca
s
e "u
s
ag
e
:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
git-svn
:
u
s
e a lo
w
ercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
D
oc
u
mentation/user
-
manual
.
txt: u
s
e a lo
w
e
rcase "
u
sag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
te
m
plates
/
ho
o
ks--u
p
dat
e
.
sa
m
ple: use a lowe
r
case "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/hooks
/
s
e
tgitperms
.
p
e
rl: use
a lo
w
e
r
c
ase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/examples:
u
se
a
l
owe
r
c
as
e
"
usag
e
:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fa
s
t-import/impor
t
-zips
.
py: use spa
c
es instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/fast-import/import-zi
p
s
.
py: fix
broken e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
lar
c
ontrib/fast-
i
mport
:
u
se
a
lowercase "usa
g
e:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
con
t
rib/cr
e
dential: use a l
o
w
ercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport: use a
l
owe
r
c
a
se "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimpor
t
:
u
se a lowercase "usage:
"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
il
a
r
git-c
v
sex
p
ortcommit: u
s
e a lowercase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-archimport:
u
se a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
ilar
git-merge-one-file: use a lowe
r
case "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use a lowerc
a
se
"usag
e
:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
g
i
t-svn:
u
se a lowercase
"usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-s
h
-se
t
up: use a lowe
r
case "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Agui
l
ar
t7800: "defau
l
ts" i
s
no longer a builtin tool nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Agui
l
a
r
t7800: m
o
derni
z
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
A
gu
i
lar
t7800: update copyright
notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d A
g
uilar
d
if
f
tool:
silen
c
e
uninitial
i
zed var
i
abl
e
war
n
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4
m
erge: fix
printf us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguil
a
r
difftool--helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguila
r
d
oc: gener
a
te a list of valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
merget
o
ol--lib:
a
dd functions for fi
n
ding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetoo
l
-
-
lib: improve the help text in guess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next