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
difftool: rename variables for consistency
2016-12-12
David Agu
i
lar
difftool:
r
ename vari
a
bl
e
s fo
r
consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Agui
l
a
r
difftool: chdir as e
a
rly as p
o
s
si
b
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid
A
g
uil
a
r
difftool
:
sanitize
$
workdir as early as
poss
i
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid Aguilar
difftool: fix dir-dif
f
index
crea
t
io
n
wh
e
n in
a
s
u
b
d
ire
c
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
A
guilar
difftool: use G
i
t::* function
s
in
s
tead of pa
s
si
n
g a
r
ound
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
avid Aguil
a
r
d
i
fft
o
o
l
: avoid $GIT_DIR
an
d
$GI
T
_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
Aguilar
difft
o
ol:
h
andle
u
nmer
g
ed fil
e
s
i
n dir-
d
iff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: initia
l
i
z
e vari
a
bles for read
a
bility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Agui
l
ar
mergetoo
l
:
h
onor
tempfile configuration when res
o
lving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
me
r
getool: sup
p
ort
de
l
ete/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Davi
d
A
guilar
difftool:
ignore symbo
l
ic links in us
e
_wt_fi
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Dav
i
d Ag
u
i
l
a
r
contrib/su
b
tree: ignore log
.
date configurat
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetools: add winmerge
a
s
a builtin
t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
i
d
Aguilar
merget
o
ol--lib: set IF
S
for difftool
and mergeto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avi
d
Agui
l
ar
merget
o
ols: stop
se
t
ting $stat
u
s
i
n merge_
c
md
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Agu
i
lar
mergetool: simpli
f
y condi
t
ion
a
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
d
if
f
tool--h
e
lper:
add ex
p
lici
t
exit
sta
t
ement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
er
g
etool--lib: remove
u
se of $
s
t
a
tus
global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Agui
l
a
r
diff
t
ool: hono
r
--trust-e
x
it-code for builtin to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Da
v
id A
g
uilar
diff
t
ool:
ad
d
support for
--trus
t
-ex
i
t-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: add te
s
t cases for mergetool
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid
A
guil
a
r
mergetool
:
add an option for writing to a temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Agu
i
lar
merge
t
ool: use more con
s
ervative temp
o
rary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
test-l
i
b-fu
n
ctions: adjust style to match Coding
G
uideli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguila
r
t7610-merget
o
o
l: use
t
est_
c
onfig to
i
solate test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergeto
o
l
s
/meld: make usage o
f
`--output`
c
onfigur
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
u
i
l
a
r
git-sh-se
t
u
p
: move
GI
T
_
D
I
R
initia
l
izat
i
o
n
into a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguil
a
r
merget
o
ol: u
s
e more con
s
ervative te
m
p
o
rary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
test-lib-functions:
adjust
s
tyle
to match
Cod
i
ngGu
i
delines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guil
a
r
t7
6
10-m
e
rgetool: prefer test_
c
onfig o
v
er git
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
Agu
i
lar
t7610-me
r
getool: add missing &
&
an
d
remove
c
o
mmen
t
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
gu
i
lar
t7610-mergetool: u
s
e tabs instead of a mix of tab
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion:
a
dd --sh
o
w-signature for lo
g
and s
h
ow
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
avid Aguilar
st
a
sh: prefer
-
-
q
u
iet
over shell redirection o
f
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguila
r
r
e
fs: m
a
k
e rev-par
s
e --q
u
iet actuall
y
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
avid Aguilar
t1503
:
use tes
t
_mu
s
t_
b
e_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Davi
d
Aguilar
Documentation: a
note about stdout
f
o
r
git
r
ev-pa
r
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
c
l
eanups: ensure t
h
at git-compat-util
.
h
is include
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Da
v
id Aguilar
stylefix: ast
e
risks stic
k
to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d Aguil
a
r
gitk: Catc
h
mkdte
m
p errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d Ag
u
ilar
gitk: Use mktemp -d
to avoid pr
e
d
ictab
l
e temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid
A
guilar
gitk: Honor TMPDIR
w
h
en
v
iewing exte
r
na
l
diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
d
ifftool: support rep
o
sitorie
s
w
ith
.
git-f
i
l
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Ag
u
i
lar
pull: add
-
-ff-only to th
e
help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull
:
ad
d
pull
.
f
f
confi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-sen
d
: e
l
iminate HM
A
C
deprecation w
a
rni
n
gs o
n
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
cache
.
h: elimina
t
e SHA-1 deprecati
o
n warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Agu
i
l
ar
Makef
i
le: add supp
o
rt f
o
r Apple Commo
n
Cryp
t
o fa
c
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid Ag
u
ilar
Mak
e
file: fi
x
default regex settin
g
s
on Da
r
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Dav
i
d
Aguilar
mergetools/kdiff3: do
not u
s
e
--
a
uto
wh
e
n dif
f
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
a
vid Aguilar
help
.
c: add a
c
ompa
t
ibility comme
n
t to
c
md_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avi
d
Aguilar
contrib/mw-to-git/t/i
n
sta
l
l-wiki
.
sh:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
contrib/e
x
a
m
pl
e
s
/git-remot
e
.
perl: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
te
s
ts: use a l
o
werca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
av
i
d Aguilar
git-s
v
n
:
u
se a
lo
w
ercas
e
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
Do
c
u
m
entation/user-manu
a
l
.
t
x
t: u
s
e a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
lar
templat
e
s/ho
o
k
s
--u
p
date
.
s
a
mple:
use a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/hooks/
s
etgi
t
perms
.
pe
r
l: use a lo
w
erc
a
se
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
g
u
i
l
a
r
c
ontrib/examples: use a low
e
rcas
e
"u
s
age:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
contrib/fa
s
t
-
i
m
p
ort/import-zips
.
py
:
use spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
t
rib/fast
-
import/import-zips
.
py
:
fix broken
e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Ag
u
i
lar
c
ontrib/fast
-
import: us
e
a lowerca
s
e "usa
g
e:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Agui
l
a
r
contri
b
/credential:
use a
l
o
w
ercase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-c
v
s
i
m
port: use a
lowercas
e
"usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
git-cv
s
imp
o
rt: us
e
a
l
o
we
r
ca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agui
l
ar
git-cvsexportcom
m
it:
use a
lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
archimpor
t
: u
s
e a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-
m
erge-one-file
:
use a low
e
rcase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-relink: use a l
o
we
r
case "usag
e
:"
s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agui
l
ar
git
-
svn: use a lo
w
ercase
"
usage:
"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
a
r
git-sh-setup: use a
lowe
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t
7800: "defa
u
lts" is no
longe
r
a
b
u
i
ltin tool
n
am
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t7800:
m
odernize te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: u
p
d
ate copyr
i
g
ht
notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
d
ifftool: silence uninitialize
d
variable warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
id Aguilar
p4merge: fi
x
p
rintf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vi
d
Aguilar
d
ifftool--h
e
lper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Aguilar
d
oc: generate a list of valid me
r
ge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
i
d Aguilar
mergetool
-
-lib: add functions for finding
a
vailable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
mergetool--lib:
i
mprove th
e
he
l
p text in
g
u
e
ss_mer
g
e
_
tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
m
erg
e
tool--l
i
b: simplify
comma
n
d expres
s
ions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merget
o
ols: sim
p
lify how
w
e han
d
le "vim" and "
d
efaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergetool--l
i
b: im
p
rove s
h
o
w
_
too
l
_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
merg
e
tools/vim: remove redundant diff com
m
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Aguilar
merg
e
t
o
ols
/
p4m
e
rg
e
: Honor $TMPD
I
R for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avid
A
guilar
mergetools/p4merge: Handle
"/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avi
d
Aguilar
mergeto
o
l--lib
:
A
l
lo
w
custom commands to o
v
erride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
lar
git
k
: Rename 'tagconte
n
ts'
to 'cached_tagcont
e
nt'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
ar
gitk: Teach
"
Rere
a
d references"
t
o reload ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguila
r
m
erg
e
tool
,
difftool: Documen
t
--tool
-
help c
o
nsi
s
ten
t
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
Aguilar
difftool: D
i
s
able -
-
symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguilar
diff
t
oo
l
: Handle compare() re
t
urning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ila
r
difftool
:
Wrap long lines for
r
e
adability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diff
t
o
ol: Check all retur
n
co
d
es from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftool: Handle finding mergetools/ in a path wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool:
U
s
e
symlinks when
dif
f
ing ag
a
ins
t
t
he worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
dif
f
t
ool: Call
th
e
te
m
p directory "git-diffto
o
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftool: Move opti
o
n
v
alu
e
s int
o
a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Ag
u
ilar
diffto
o
l
: Eliminate global
v
a
riables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool: Simplify
p
rint_t
o
o
l
_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next