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
diff.c: color moved lines differently, plain mode
2017-06-19
David Aguilar
mergetools/meld: improve compati
b
iilty with Meld
o
n
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
difftool: ha
n
dle modified s
y
mli
n
ks
i
n
di
r
-diff mo
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Agu
i
la
r
t7800: clean
u
p cr
u
ft left b
e
h
i
n
d by test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
D
a
v
id
Aguilar
t7800: remove whitespace befo
r
e redir
e
ct
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David
A
guila
r
t7800: repl
a
ce "wc
-l" with test_line_co
u
nt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t
7800: simplify basic usage tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Aguilar
d
i
f
ft
o
o
l
:
fix
bug when
p
rinting usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Agu
i
l
ar
gitk: Remove
tr
a
nsla
t
e
d
message from co
m
men
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Agui
l
ar
me
r
getools: fix xxdi
f
f hotkey
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Dav
i
d Aguilar
difft
o
ol: rename var
i
ables for co
n
si
s
tency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
A
guilar
difftool: chdir as early
a
s
p
ossible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
diffto
o
l: sanit
i
ze $workdir as e
a
r
l
y as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Da
v
id Ag
u
ilar
diff
t
o
o
l: fix dir-diff index
c
reation when in a subdire
c
tor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Davi
d
Aguilar
diff
t
o
o
l:
f
ix dir-di
f
f index creation when
i
n
a
s
ubdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David
A
g
u
ilar
mergetools/vimdiff: trust Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David
A
guila
r
merget
o
ol: h
o
nor mergetool
.
$tool
.
trust
E
xit
C
ode for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool: hono
r
-O<orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
vid
A
guilar
mergetool: honor
d
iff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
A
g
u
ilar
mergetool: move mai
n
p
r
og
r
am
f
l
o
w into a main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Dav
i
d Aguilar
mergeto
o
l
: add co
p
y
right
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: use G
i
t::*
functions instead
o
f pas
s
in
g
around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
Aguilar
difftoo
l
:
a
voi
d
$GIT_DIR and $GIT
_
W
ORK_
T
REE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
A
g
ui
l
ar
s
u
btree: adjust function
d
efinitions to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d A
g
ui
l
ar
subt
r
e
e: adj
u
st s
t
yle to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtre
e
: fix "git subtree split
-
-re
j
oin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Aguilar
t7900-subtree
.
sh: fix quoting
a
nd broken
&
& c
h
ains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
Aguil
a
r
d
i
ff
t
ool:
h
an
d
le unme
r
g
ed files
i
n d
i
r-diff
mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
Aguilar
diffto
o
l:
initial
i
ze vari
a
b
l
es for r
e
adabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
Aguilar
m
ergetool:
hon
o
r tempfile configuration when r
e
solving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avid Aguil
a
r
merge
t
ool: support delete
/
delete co
n
flicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguil
a
r
difftool: ignore symbolic
l
inks in u
s
e_
w
t_fil
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
D
a
vid
Ag
u
ilar
contrib/subtree: ignore log
.
d
a
te configuratio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mer
g
etools: add winmerge as a builti
n
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetoo
l
--
l
ib: set IFS f
o
r diffto
o
l
a
nd m
e
rg
e
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguilar
merget
o
o
l
s: stop sett
i
ng $sta
t
us i
n
m
e
rge
_
cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool:
si
m
p
l
if
y
conditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agu
i
lar
d
i
f
ft
o
ol--helper
:
a
d
d explici
t
exit s
t
atement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid
Aguilar
mergetoo
l
--lib: remov
e
use of $status
g
lobal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
difftool: honor -
-
trus
t
-
exit-code for builtin
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David A
g
uilar
d
i
fftool: add support
f
or
-
-
trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: add
t
est c
a
ses
for merge
t
oo
l
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merget
o
ol: add an option for writing t
o
a tem
p
or
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
mergetool: us
e
more
conse
r
vative te
m
porary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
est-
l
ib-func
t
ions: adjus
t
styl
e
to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
t7610-merg
e
tool: use test_
c
onfi
g
to isolate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merget
o
ols/
m
eld: m
a
ke usage of `--outp
u
t
`
configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh
-
s
et
u
p
:
mo
v
e
GIT_DIR init
i
alization into a
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
m
e
r
getool
:
u
s
e more cons
e
rvative temporary file
n
ame
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
t
e
s
t-lib-
f
u
nctions:
adjus
t
sty
l
e
to match
C
odingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610-merget
o
ol: pref
e
r
tes
t
_config ove
r
g
it
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
t7610-mergetool:
add
m
i
ssing && and remo
v
e co
m
mented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool:
u
se tabs instead of
a
mix
o
f
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
com
p
le
t
i
o
n: add -
-
show-signa
t
ure
f
or log
a
nd show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash:
prefer --quiet
over shell redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
r
efs: make rev
-
par
s
e --qu
i
et actually quie
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
Dav
i
d Aguilar
t1503:
u
se test
_
must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
A
guil
a
r
Docume
n
ta
t
ion: a note abo
u
t stdo
u
t
for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
a
vid Agu
i
l
a
r
cleanups: ensure that git-compat-uti
l
.
h i
s
included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Dav
i
d
Aguil
a
r
sty
l
e
f
ix: a
s
t
e
risks stick t
o
the variable, not t
h
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David A
g
ui
l
a
r
gitk: Catch mkdtemp error
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
i
d Aguilar
git
k
: U
s
e
m
ktemp -
d
to avoid pre
d
ictable tempor
a
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor TMPD
I
R
w
hen viewing external d
i
ffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difftool:
s
upp
o
rt re
p
osi
t
ories with
.
git-fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid
A
guilar
pull: add --ff-only t
o
the
h
elp
t
e
x
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David A
g
uilar
pull:
a
dd pull
.
f
f
confi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Davi
d
Aguilar
imap-sen
d
: e
l
iminate HMAC deprecati
o
n wa
r
nings on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguila
r
cach
e
.
h: elim
i
nate SHA-1 depreca
t
ion warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
i
d
Ag
u
i
l
a
r
Mak
e
file: add support for Apple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguil
a
r
Makefile: fi
x
d
efau
l
t
reg
e
x settings on Da
r
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Agui
l
ar
merget
o
ols/kd
i
ff
3
:
d
o not us
e
--a
u
to when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid
A
gu
i
lar
h
e
lp
.
c:
add a co
m
p
a
t
ib
i
lity comment t
o
c
md_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Agui
l
a
r
cont
r
ib/mw-to-git/t/install-wiki
.
s
h: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contri
b
/examp
l
es/git
-
remote
.
perl: use
a
l
owerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
tests: use a lowerc
a
se "usag
e
:
"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
Aguil
a
r
git-svn: use a lower
c
a
s
e
"
u
s
a
ge:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
D
o
cume
n
t
a
tion/us
e
r-manual
.
txt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
il
a
r
templates/hooks-
-
update
.
sample: use a lowercas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/hoo
k
s
/
setgitperms
.
perl: use a
l
owe
r
case "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uilar
contrib/
e
xamples
:
use
a low
e
rcase
"
usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
co
n
trib/fast-im
p
ort/import-z
i
ps
.
py:
u
se spaces
instea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
contrib/fast-impo
r
t/import-zip
s
.
py: f
i
x brok
e
n
error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contrib/
f
ast-imp
o
rt
:
u
s
e a
lowe
r
c
ase "usage
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contri
b
/
crede
n
tia
l
: use a lower
c
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
i
mpo
r
t:
u
s
e a lowerc
a
se
"
usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-c
v
s
import: use a lowe
r
case "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cv
s
exportcom
m
it: use a
lowerca
s
e
"usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-archimport: use a lowercase "us
a
ge
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-me
r
g
e-one-file
:
use a
lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
g
i
t
-relink: use a lowerca
s
e "usage
:
" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-s
v
n: use a lowercase "us
a
ge:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
guilar
git-sh-set
u
p: use a lowe
r
case "
u
sa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t7800: "def
a
ults
"
is no longer a buil
t
in to
o
l name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid A
g
uilar
t7800:
modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Dav
i
d Aguilar
t7
8
00: u
p
date c
o
pyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Da
v
id Aguilar
difftoo
l
: silence unini
t
ializ
e
d variable warn
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avi
d
Aguilar
p
4
merge: fix pr
i
ntf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguila
r
difftool--helper
:
fix print
f
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guil
a
r
d
oc:
g
ene
r
ate a list of valid merge t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
av
i
d Aguilar
m
ergetool--lib: add functions for
f
i
ndin
g
a
v
aila
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
id Agu
i
la
r
merget
o
o
l--lib
:
impr
o
ve th
e
help text in guess
_
merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next