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
rebase: emit one "fatal" in "fatal: fatal: <error>"
2021-06-02
Davi
d
Aguilar
contr
i
b/
c
ompletion: fix zsh completion regre
s
si
o
n from
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
D
a
vid Aguilar
git-gui: ssh-askpass: add a chec
k
box to sh
o
w the input
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
David Aguilar
contrib/compl
e
t
i
o
n: add smerge
t
o the merget
o
ol completion
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
D
avid Aguilar
merg
e
to
o
ls: add suppor
t
for smerge (Subl
i
m
e
Merge)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-06-19
David
Aguilar
mergetools/mel
d
: i
m
prove comp
a
t
i
biilty with M
e
ld
o
n
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
D
a
vid Aguilar
difft
o
ol: handle modified symlinks in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
D
a
vid Ag
u
i
lar
t7800:
cleanup cruft left behind b
y
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David
Aguila
r
t
7
800:
r
emove whit
e
space before re
d
i
rect
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Agu
i
lar
t7800: replace "wc -l" with tes
t
_line
_
c
ount
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Agu
i
lar
t7800: simplify basic usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David
A
guilar
dif
f
t
ool: fix b
u
g when
p
rinting usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguila
r
gitk: Remove t
r
ans
l
ated
m
es
s
age fr
o
m comments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
mergeto
o
ls: f
i
x x
x
d
i
ff
hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
Aguilar
difft
o
o
l
:
r
ename v
a
riables for consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
A
gu
i
lar
di
f
ftool:
chd
i
r as early as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
di
f
ftool: s
a
nitize
$
workdir as e
a
rly as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Ag
u
il
a
r
difftool:
f
i
x dir-
d
iff index
creation when in
a
subdirec
t
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
D
avid Agu
i
la
r
difftool:
f
i
x
d
i
r
-
diff index creation wh
e
n in a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
merget
o
ols
/
vimdiff: trust Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
merg
e
t
o
ol: honor
m
erget
o
ol
.
$tool
.
tr
u
stE
x
itCode f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: honor -O<orde
r
f
i
l
e
>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguila
r
mergetool: h
o
no
r
diff
.
ord
e
rFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
ergetool: mo
v
e main prog
r
am flo
w
into a main() functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
e
rgetool:
add cop
y
right
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: use Git::* funct
i
ons
i
ns
t
e
ad of p
a
ssing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
a
vi
d
Aguilar
difft
o
ol: avoid $GIT_DIR and $
G
IT_WORK_T
R
E
E
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
sub
t
ree:
a
djust
function
d
efinitions to
mat
c
h Cod
i
n
gGuideline
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
avid Aguilar
subtree: adjust styl
e
to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David A
g
uilar
subtree: fi
x
"git s
u
btree s
p
lit
-
-rejo
i
n"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Davi
d
Aguilar
t7900-subtree
.
s
h
: fix q
u
oting
a
nd broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
a
vid Ag
u
ilar
difftoo
l
: handle unmerged files i
n
dir-di
f
f mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: ini
t
ial
i
ze vari
a
bles
for readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avid
A
guilar
mergetoo
l
: honor tem
p
file c
o
n
f
igur
a
tion when res
o
l
ving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguila
r
me
r
getool: su
p
port delete/delete
c
onflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
dif
f
tool:
ignore symbolic
l
inks
in use_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Agu
i
la
r
contri
b
/subtree: ignore log
.
date con
f
i
g
urati
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Ag
u
ilar
mergetools: add winmerge as a b
u
ilt
i
n
too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Ag
u
ilar
merget
o
o
l-
-
l
ib: set IF
S
f
or difftool and m
e
rgetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
e
r
getools: s
t
op setting $status in merge_cmd
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
i
d
Aguil
a
r
mergetool: simplify conditi
o
nal
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Ag
u
ilar
diffto
o
l--helper
:
add
e
xplicit exit
sta
t
ement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool--lib: remove use of
$status gl
o
ba
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David
Aguil
a
r
difftool: honor --trus
t
-
ex
i
t-code
f
o
r builtin
t
o
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
a
v
id Ag
u
ilar
difftool: add s
u
p
port fo
r
--tr
u
st
-
exit
-
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Agui
l
ar
t
76
1
0-mergetool
:
add
test cases for mer
g
et
o
ol
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Agui
l
a
r
mergetool:
a
dd an option
f
or writing to
a
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
mergetool: use more conservative tempora
r
y filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-lib-functions: ad
j
u
s
t style t
o
match
C
odingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
i
d
Agui
l
ar
t
7610-merge
t
ool: use
t
est_config to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
m
e
rgetools/me
l
d: make usa
g
e of `-
-
outpu
t
`
c
onfigu
r
able
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
g
it-sh-setup: move GIT_DIR initiali
z
ation into a
f
unctio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
me
r
getool: use more co
n
ser
v
ative tempo
r
ar
y
fi
l
ename
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguila
r
test-lib
-
functio
n
s: adjust style to match CodingG
u
idel
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t
7610-mergetool: prefer test_config
over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t7610-mer
g
e
tool: add missing && and remove c
o
mmented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agui
l
a
r
t7610-merg
e
tool: use tabs instead of a mix of
t
abs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Da
v
id Ag
u
ilar
c
o
m
pletion:
a
dd -
-
s
ho
w
-signature for log
a
nd
s
h
ow
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash: prefer --q
u
ie
t
ov
e
r shell redirec
t
i
o
n of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Agui
l
a
r
refs: make
rev-parse --quiet a
c
tually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Ag
u
ilar
t1503: use test_mus
t
_
b
e
_
emp
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid Aguil
a
r
Docum
e
ntation: a note about stdou
t
for git
rev-p
a
rse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David A
g
u
ilar
c
l
eanups:
e
ns
u
re that git-compat-util
.
h is i
n
cluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Dav
i
d A
g
uilar
stylefix:
asterisks stick to
the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguila
r
gitk: C
a
tc
h
mkd
t
emp erro
r
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Agui
l
ar
git
k
: Use m
k
temp -d to avo
i
d
predictabl
e
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id Agui
l
ar
gitk: Honor TMP
D
IR
when viewing external
d
iffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
a
v
i
d
Aguil
a
r
diffto
o
l: sup
p
ort repos
i
tories with
.
git-file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add --ff-only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
p
u
l
l
:
a
dd pul
l
.
f
f configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
avid
Aguilar
im
a
p-send: eliminate
HMAC de
p
rec
a
tion warnin
g
s
o
n M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d Aguilar
c
a
che
.
h:
eliminate
SHA-1 deprecation war
n
in
g
s
o
n
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d Aguila
r
Makefile: a
d
d support for App
l
e
C
o
mmonCrypt
o
facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
M
ake
f
i
l
e: fix def
a
ult regex
s
ettings
on D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetool
s
/kdiff3: do
not use --auto when diff
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: ad
d
a
compatibility comment to cmd_v
e
rsion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contr
i
b/
m
w-to-git/t/instal
l
-wik
i
.
s
h: use a low
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
con
t
r
i
b/
e
xample
s
/git-re
m
ote
.
p
e
rl: use a low
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests
:
u
se a lower
c
ase
"u
s
age:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
g
i
t-
s
v
n
: us
e
a lowercas
e
"usage:
"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
D
o
c
umentati
o
n/user
-
man
u
a
l
.
txt: us
e
a lower
c
ase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
template
s
/ho
o
ks-
-
up
d
ate
.
s
ampl
e
: use
a lowerc
a
se
"
u
s
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
con
t
rib/hooks/s
e
tgitperms
.
perl: us
e
a lowerc
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/examples: use
a
lo
w
ercase "usag
e
:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-im
p
ort/i
m
por
t
-zips
.
py: use sp
a
ces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guila
r
contrib/fast-import/import-zips
.
py: fix br
o
k
en e
r
r
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
cont
r
ib/
f
a
st-im
p
o
rt:
u
se a lowercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
lar
c
o
n
trib/credential:
use a lowercase
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-cvsimpo
r
t
:
use a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Aguilar
g
i
t-c
v
simp
o
rt: use a lowe
r
case "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-cvsexportcommit:
u
se
a
lowe
r
case "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimport: use a lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
git-merge-on
e
-file: use a
l
owercase "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
r
elink: use a lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a
l
owerca
s
e
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
a
r
git-
s
h-setup: use a
l
owercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id
A
guilar
t7800
:
"
d
efaults
"
is no long
e
r a
bu
i
l
t
in tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid A
g
u
i
lar
t7800: mo
d
ernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Davi
d
Aguilar
t7800:
u
pdate copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: s
i
len
c
e uninitiali
z
ed vari
a
ble war
n
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguil
a
r
p4
m
erg
e
:
fix prin
t
f u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next