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/t5534-rev-parse-gives-multi-line-output-fix' into maint
2017-06-19
David Aguil
a
r
mergetools/
m
eld: improve
c
ompa
t
ibi
i
lty
w
i
t
h
Meld
o
n
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
di
f
fto
o
l:
h
a
n
dle modified symlink
s
in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
Da
v
id Agui
l
ar
t7800: clea
n
up cruft left beh
i
nd by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguil
a
r
t78
0
0: re
m
ove whitespace bef
o
re redir
e
ct
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t7
8
00
:
replace "wc -l"
with test_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Ag
u
ilar
t7800: s
i
m
plify bas
i
c
us
a
g
e
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
Da
v
id Aguilar
difftoo
l
:
f
i
x
bug
w
hen pr
i
ntin
g
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguilar
g
itk: Rem
o
ve tr
a
n
s
la
t
ed message
from
comments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
mer
g
etools: f
i
x
xxdiff hotk
e
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
v
id Agui
l
ar
difftool: rename va
r
iables for consistenc
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d
A
g
u
ilar
d
ifftool: chdir as early as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David A
g
uilar
difftool: sanitize $workdir as
ea
r
ly as pos
s
ible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
A
guilar
difftool:
f
ix dir-
d
iff index c
r
e
a
t
ion when
i
n
a s
u
b
d
irect
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Aguilar
d
ifftool: fix dir
-
diff i
n
d
e
x creation when
in a subd
i
rectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Da
v
i
d
Agui
l
ar
merge
t
ool
s
/vimdiff: trust
V
i
m's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David
A
guilar
m
e
r
getool: hon
o
r mergetool
.
$tool
.
trustE
x
itCode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Davi
d
A
gui
l
a
r
mergetool
:
ho
n
or -
O
<
o
rderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
v
id Agui
l
ar
mergetool: honor diff
.
orderFil
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id Agu
i
lar
m
e
rgetool: move main progr
a
m fl
o
w into a mai
n
()
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id Agui
l
ar
merg
e
tool:
add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
di
f
ftool: us
e
Git::*
f
unctions in
s
tea
d
of p
a
ssin
g
around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguila
r
difftool:
a
void $GIT_DIR and $GI
T
_
W
ORK_
T
R
E
E
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Agui
l
ar
s
u
btr
e
e
:
adju
s
t function def
i
nitio
n
s to match Codin
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
i
d
Aguilar
subt
r
e
e
: adjust sty
l
e to
match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
a
v
id Aguilar
su
b
tree: fix "
g
it
subtree split -
-
rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Aguilar
t7900-subtree
.
sh
:
fix
q
uoting an
d
broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id Aguilar
d
ifftool: handle unmerged file
s
i
n dir
-
diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: init
i
alize vari
a
bles
f
or
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vid Aguilar
merge
t
ool: ho
n
or tempfile co
n
fi
g
uration wh
e
n resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguil
a
r
mer
g
etool: suppor
t
d
e
lete/delete c
o
nfli
c
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
D
avi
d
Aguilar
d
i
f
ftoo
l
: ignor
e
symbolic l
i
nks in use_wt_fi
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguila
r
contrib/su
b
tree: i
g
nore log
.
dat
e
c
onf
i
guration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
vid Aguilar
me
r
getools: add win
m
e
r
ge as
a
b
u
i
l
t
in to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agui
l
ar
mergetool
-
-lib: set IFS for
d
ifftoo
l
a
n
d mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
v
id Aguilar
mergetools: st
o
p setting $status
i
n merg
e
_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Ag
u
ilar
mergetoo
l
: s
i
mplify co
n
ditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
A
g
uilar
dif
f
tool--helper: add expli
c
i
t
exit s
t
atement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguilar
merg
e
tool--lib:
remove use of $status gl
o
bal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Agui
l
ar
diff
t
ool: honor --trust-exit
-
code for built
i
n
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Aguilar
dif
f
tool:
add support for --trus
t
-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
t7610-merg
e
tool: add test cases
f
or
mergetoo
l
.
wr
i
teToT
e
mp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool
:
add
a
n
option for writing
to a temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Ag
u
ilar
mer
g
e
tool
:
use mor
e
c
onservative te
m
porary
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
test-lib-functions
:
adjust st
y
le t
o
match CodingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
Agui
l
ar
t7610-merge
t
ool: u
s
e test
_
config to
i
s
o
la
t
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/meld: make usage of `--output` c
o
n
f
igurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
git-sh-setup: move
GIT
_
DIR init
i
alization into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
mergetool: use more c
o
nservative tem
p
orary
fil
e
names
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid A
g
uilar
test-l
i
b
-
fu
n
ctions: adjust
s
tyle to match Co
d
ing
G
uidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: p
r
efer
test_co
n
fig
over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t7610-
m
er
g
etool
:
a
d
d missing && and remove
c
o
m
mented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id
A
g
u
i
l
a
r
t7610-me
r
getool: u
s
e tabs
i
nstead
o
f a
m
i
x of
t
a
bs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David A
g
uilar
c
ompletion:
add --show-signature fo
r
l
og
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguil
a
r
stash
:
prefe
r
--quiet ove
r
shell
r
edirection
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David A
g
uilar
refs:
make rev-parse --quiet actually qui
e
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Agui
l
ar
t1503: use
test_
m
ust_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d A
g
uilar
Documentatio
n
:
a
n
o
te about
stdo
u
t fo
r
g
i
t rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Agui
l
ar
cleanups:
e
ns
u
re that
g
it-com
p
at-util
.
h is inc
l
uded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
styl
e
f
i
x: asteri
s
ks stick to
t
he variab
l
e,
n
ot
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d Aguilar
gitk: Catch m
k
dtemp erro
r
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Use m
k
temp
-d to avoi
d
predictable tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
g
i
t
k: Honor TMPD
I
R
when viewing
e
xte
r
nal di
f
fs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Agui
l
a
r
difftool: support repositories with
.
g
i
t-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id Agu
i
l
a
r
pull:
add --ff
-
o
nly
t
o the
h
e
lp text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
A
guil
a
r
pull: add p
u
ll
.
ff con
f
iguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David
A
guilar
imap-se
n
d
: eliminat
e
HMAC deprecatio
n
warnings o
n
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
cache
.
h: eliminate SHA
-
1 dep
r
ecat
i
on wa
r
nin
g
s
o
n Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add support
f
or
Apple CommonCrypto f
a
c
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David A
g
uilar
M
ak
e
f
i
le: fix default regex settings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Aguilar
mergetools/kd
i
ff3: do not
use
-
-auto when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Ag
u
ilar
h
e
l
p
.
c:
a
dd a
compatibility commen
t
t
o
c
md_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid A
g
uila
r
contrib/mw-
t
o-g
i
t/t
/
install-wiki
.
sh: u
s
e a lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
co
n
t
r
ib/e
x
am
p
les/g
i
t
-
r
e
mote
.
perl: use a lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
t
ests
:
u
s
e a lowercase
"
us
a
g
e
:
"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-svn: use a lo
w
erc
a
se
"usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Docu
m
entation/us
e
r-m
a
nual
.
txt:
use a lowercase "
u
sag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templates/h
o
oks--upd
a
te
.
s
ample: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
c
ontr
i
b/hook
s
/setgit
p
e
r
ms
.
pe
r
l:
u
se a lowerca
s
e "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
lar
cont
r
ib/exam
p
les: use a lo
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
c
ontrib/fast-import/
i
mport-zips
.
py: u
s
e spaces instea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/fast-import/
i
mpo
r
t
-zips
.
py:
f
ix brok
e
n erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguil
a
r
contrib/fast-impo
r
t
: u
s
e a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uil
a
r
cont
r
ib/credential: u
s
e
a
l
owe
r
case "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport: use a
lowercase
"usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
gi
t
-cvsi
m
port: use a lower
c
ase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
gi
t
-
c
v
se
x
portcommit: use a lowerca
s
e "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
g
it-archim
p
ort: use a l
o
wercase "us
a
ge:
"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-merge-one-file: use a
l
owerca
s
e "usa
g
e:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
lar
git
-
re
l
ink: use a l
o
wercase
"u
s
age
:
" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it
-
svn: use a
low
e
rcase
"us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Aguilar
git-s
h
-setup:
use a l
o
w
e
rcase "us
a
ge:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
A
g
uilar
t7800: "defaults" is
n
o longer
a built
i
n too
l
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
A
g
u
ilar
t78
0
0:
u
pdate
c
opyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d
Aguilar
d
i
fftool: si
l
e
n
ce uni
n
itialized variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
p4me
r
ge: fix
p
r
intf usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avi
d
Aguila
r
d
ifft
o
ol--help
e
r:
f
ix printf usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
doc: genera
t
e a list
o
f
valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
Agu
i
l
a
r
mergetool--l
i
b:
add functi
o
ns for finding a
v
ailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
mer
g
e
tool--lib: improve
the help text in guess_mer
g
e_t
o
ol()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next