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
Documentation: add instructions to help setup gmail 2FA
2016-05-16
D
avid Aguilar
difftool: h
a
n
d
le unmerged
fil
e
s
in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Ag
u
ilar
difftool:
i
nitialize
var
i
abl
e
s
f
o
r
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
v
id Aguilar
mergetool: h
o
nor tempfile
co
n
f
i
guration when
r
es
o
lv
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
avid Agui
l
ar
mergetool:
sup
p
ort delete/de
l
e
t
e conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David A
g
uila
r
d
i
f
ftool: ig
n
ore symbolic links in use_wt_f
i
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
contrib/su
b
t
r
ee: ig
n
or
e
l
o
g
.
date conf
i
gurat
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
i
d
Aguilar
mergetools: add winme
r
ge as
a buil
t
in tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agu
i
l
a
r
mergetool--l
i
b: set
IFS for difftool and
m
er
g
etool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
mer
g
etools: stop se
t
ting $
s
t
a
tus
i
n mer
g
e_
c
md()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
ergetool: s
i
mplify condi
t
ionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
v
id Aguilar
difft
o
ol--he
l
per:
a
d
d explicit e
x
it
sta
t
eme
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David A
g
u
i
lar
mer
g
eto
o
l--lib: remo
v
e u
s
e of $sta
t
us global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
diff
t
ool:
h
onor --trust-exit-
c
ode for b
u
iltin
t
ools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
avid Agui
l
ar
dif
f
tool: add
s
upp
o
rt for --trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
t7610-m
e
rgetool:
a
dd
t
est cases
for merget
o
ol
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merget
o
ol: add
a
n op
t
ion for writing to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguil
a
r
merge
t
ool: use
m
ore
c
o
nserva
t
ive temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t
e
st-lib-f
u
nctions: adjust style to
matc
h
CodingGu
i
deline
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
A
g
uilar
t7610-me
r
g
e
tool:
use test_config
to
i
so
l
ate tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
mergetools/meld:
m
a
ke usage
o
f `--ou
t
p
u
t` c
o
nfigu
r
able
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id A
g
ui
l
ar
git-sh-setup: move GIT_DIR initialization
i
nto a functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
me
r
getool: use more c
o
nservative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-lib-functions: adjust
styl
e
to match
C
odingGuid
e
lines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
gu
i
lar
t
7
610-mergetool: prefer t
e
st_config
o
v
e
r
git
c
o
n
f
ig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
t7610-mergetool:
a
d
d
missing && a
n
d r
e
move commen
t
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
t
7
6
1
0-merge
t
ool
:
u
se tabs i
n
stead
of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Dav
i
d
A
guilar
c
ompletion: add --show-signature for
log and sh
o
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash:
p
refer --quiet over shell re
d
ir
e
ction
of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
av
i
d Agu
i
lar
r
e
fs: ma
k
e re
v
-parse -
-
quiet a
c
tually qu
i
et
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguil
a
r
t1
5
03: use te
s
t_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguil
a
r
Document
a
tion: a note about stdout
for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Aguila
r
cleanups: ensure that git-co
m
pat-util
.
h is
included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
a
vi
d
Agui
l
ar
stylef
i
x: asteri
s
ks stick to t
h
e var
i
able, not
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk: Ca
t
ch
mkdtemp
e
rrors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Davi
d
Aguil
a
r
gitk: Use mktemp
-d to av
o
id predictable
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
guil
a
r
g
i
tk: Ho
n
o
r
T
MPDI
R
w
hen
v
iewing exte
r
nal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
Aguilar
di
f
ftool: su
p
po
r
t repositories wit
h
.
gi
t
-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
v
id
A
guilar
p
u
ll: a
d
d
--ff
-
on
l
y to t
h
e help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agu
i
lar
pull: ad
d
pull
.
ff
c
onfigura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid
A
guilar
i
map-s
e
nd: eliminate H
M
AC deprecation warnin
g
s
on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
cach
e
.
h: elimina
t
e SH
A
-1 d
e
prec
a
tion
w
arnings
o
n Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
uil
a
r
Makef
i
l
e
: a
d
d support for Apple Commo
n
Cry
p
to f
a
cility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefile: fix default
r
e
gex set
t
ing
s
on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Aguilar
mergetools/
k
diff3:
d
o
n
o
t
u
se --auto
when diff
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c: add a
co
m
patibility comment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
contrib/mw-to-git/t/
i
nst
a
ll
-
wi
k
i
.
sh: use a lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/
e
xam
p
les/git-remot
e
.
p
e
rl: use a lowercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Ag
u
ila
r
test
s
:
use a low
e
rca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
g
it-s
v
n
: use
a
lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
D
o
cume
n
tat
i
o
n
/
user-manua
l
.
txt
:
us
e
a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
t
e
m
pla
t
e
s
/
hooks-
-
update
.
sample:
u
se a
l
owe
r
case "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
i
l
a
r
contrib/hook
s
/setgi
t
perms
.
perl
:
use a lowercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguila
r
contrib/exampl
e
s: use
a low
e
rcase
"
usage:
"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/fast-import/imp
o
rt-zips
.
py
:
u
s
e
sp
a
ces inst
e
ad
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
cont
r
ib
/
fast-impor
t
/import-zips
.
py: fix broken
e
rror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
c
ontrib/fast-import: u
s
e a lowercas
e
"u
s
age:
"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/crede
n
tial: use a lowercase "
u
s
a
ge:"
s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-cvsimport: use
a
low
e
rcase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsim
p
ort: use a lowercase "usage:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git
-
cvsexp
o
rtcommit: use a lowercase "
u
sag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-arc
h
imp
o
rt: use a lowe
r
case "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uila
r
g
it-mer
g
e-one-file
:
u
se a lowerc
a
se "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
gi
t
-rel
i
nk: use a lowercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d
A
gui
l
ar
git-
s
vn:
use a lowercase
"
usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-s
e
tup: use a lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t780
0
: "defaults
"
is no longer a builtin to
o
l
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Agui
l
ar
t7800: modern
i
ze tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t
7
800:
u
pdate co
p
yrigh
t
n
o
ti
c
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool
:
s
ilence uninitialized variable
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguil
a
r
p4merge:
f
ix
p
r
i
n
tf
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agui
l
ar
difftool
-
-
helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
doc:
g
enerate a lis
t
of
vali
d
merge
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib:
a
d
d f
u
nctions for
f
i
n
d
i
ng available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguila
r
merg
e
tool--lib: improve t
h
e hel
p
text in g
u
ess
_
merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
i
d
A
g
uilar
mergeto
o
l--lib: sim
p
l
i
f
y
c
o
m
mand
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
me
r
ge
t
ools:
simplify how
we
h
andle "vim" and "de
f
ault
s
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d A
g
uilar
merg
e
tool--lib: impr
o
ve sh
o
w_t
o
ol_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
i
l
ar
mergetools/vim: remove redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
avid Aguilar
mergetools
/
p4m
e
rge: H
o
nor $
T
MPDI
R
for th
e
/dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Agui
l
ar
m
ergetool
s
/p4merge: Ha
n
dle "/d
e
v/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--li
b
: Allow
c
u
s
tom commands to over
r
i
d
e built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Agui
l
ar
gitk: Rename
'
tag
c
ont
e
nts' t
o
'cached_tagcon
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk
:
Teach "Rer
e
ad refere
n
ces" t
o
re
l
oad t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
gu
i
lar
merg
e
tool
,
di
f
ftool:
Document --tool-help
c
on
s
istently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
di
f
ftool:
Disab
l
e
-
-symlinks
o
n
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
f
t
o
o
l: Handle
compare() re
t
urning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
ifftool:
W
r
a
p
lon
g
lines for re
a
dability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Agu
i
lar
d
ifftool: Check a
l
l
r
etur
n
codes
f
r
o
m compa
r
e()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: H
a
n
d
le findi
n
g m
e
rgetools/ in a
p
ath wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
d
ifftool:
Use symlinks when diff
i
ng
a
gainst the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
if
f
tool: Call the temp directory "g
i
t-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
f
f
tool: Move option v
a
l
u
es into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
i
fftool: E
l
iminate globa
l
variable
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool
:
Si
m
plify print_tool_he
l
p()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguila
r
t7800:
Test difftool p
a
ssing
a
r
gume
n
t
s
to
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool
:
Provide an e
m
p
t
y file wh
e
n needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agui
l
ar
Makefile: Im
p
r
ove compiler header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
etools/meld: Use '--
o
u
tput' when availa
b
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
A
guilar
mergetool
-
-lib:
R
e
f
a
cto
r
tools into sep
a
rate
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgeto
o
l--lib: Make
s
tyle consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next