repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7900-subtree.sh: fix quoting and broken && chains
2016-07-26
David Agui
l
ar
t7900-subt
r
e
e
.
sh: fix quoting and broken
&
&
c
hains
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: handle unmerged
f
i
l
es in
d
ir-diff
m
ode
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
di
f
f
t
ool: i
n
itialize variables
f
or readabi
l
ity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
Aguilar
merge
t
ool: h
o
no
r
temp
f
i
l
e
c
o
n
figuration
when resolvin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
David
A
g
u
ilar
m
erg
e
t
o
ol: suppor
t
dele
t
e/delete conflicts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-10-29
Davi
d
Agui
l
ar
difftool: ignore
s
ymbolic links
i
n
u
se_wt_file
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-23
David Ag
u
ilar
con
t
rib/subtre
e
: ignore log
.
date con
f
iguration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
David Aguil
a
r
m
e
rgetools: add winmerge
as a builtin tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
David A
g
u
ilar
merge
t
ool--lib:
se
t
IFS
for difftool and mer
g
et
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
merge
t
o
ols: stop setting $sta
t
us
i
n merg
e
_cmd()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
mergetool: simplify conditionals
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difftool--helper: add explicit exit s
t
atement
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguila
r
mergetool--lib: remove use of $s
t
a
t
u
s
global
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
David
A
guilar
difftool: honor
-
-
t
ru
s
t-e
x
it-c
o
de f
o
r builtin tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
D
avid Agu
i
lar
difftool
:
ad
d
support for
--trust-exit
-
c
ode
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguila
r
t7610-mer
g
e
t
oo
l
: add te
s
t cas
e
s for mergetool
.
writeToTemp
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mergetool: add an
o
ption
for writ
i
ng to a t
e
mpo
r
ary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Ag
u
ilar
merge
t
o
ol: u
s
e
more conservative
temporary f
i
lenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-li
b
-fun
c
tions: adjust style to match CodingGuidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Agui
l
ar
t7610-mergetool: use test
_
config t
o
isolate tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/meld: ma
k
e usa
g
e of `-
-
outpu
t
`
c
o
nfigurable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-setup:
move GIT_DIR initialization i
n
to a fu
n
ctio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
mergetool: use more co
n
s
e
rv
a
tive temporary filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguila
r
test-lib-functio
n
s: adjust
style t
o
matc
h
CodingGuidelin
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
A
guilar
t76
1
0-me
r
getool: prefer
t
est_config over
git config
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
t7610-
m
ergetool: add mis
s
ing &
&
a
n
d
re
m
ove commented
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
t7610-mergetool: us
e
ta
b
s i
n
stead of
a
mix of
t
ab
s
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
David Aguil
a
r
co
m
pletion:
add --
s
ho
w
-sig
n
atu
r
e for l
o
g and show
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d
A
guilar
stash: prefe
r
--quiet over shell redirection of the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
D
a
v
i
d Aguilar
refs: mak
e
rev-par
s
e --quiet
actually quiet
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
David A
g
u
i
lar
t1503
:
use t
e
s
t_
m
u
s
t
_be_e
m
p
t
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
D
avid Aguilar
Documentation: a not
e
a
bout st
d
ou
t
for
g
it rev-parse
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cleanup
s
: ensure that git-compat-util
.
h is
i
nclude
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-02
David Agui
l
ar
stylefix: a
s
terisk
s
stick to the va
r
iable,
not t
h
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
David A
g
u
i
la
r
git
k
: Catch mkdte
m
p er
r
o
rs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
itk: Use
m
kt
e
mp -d to avoid p
r
e
d
ictable
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Ag
u
ilar
gitk:
H
onor TMPDIR when viewing externa
l
di
f
fs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difftool: supp
o
r
t r
e
p
o
sitorie
s
with
.
git-fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add --ff-only
t
o
t
he help
t
ext
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
D
avi
d
Aguilar
pu
l
l: add pull
.
ff
configuration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
i
m
a
p-send: eli
m
inat
e
HMAC d
e
precatio
n
warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
u
ila
r
cache
.
h: eliminate SHA-1 deprec
a
tion warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vid Aguilar
M
a
kefile:
a
d
d
supp
o
r
t
for Ap
p
le Com
m
o
n
C
rypt
o
facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
Davi
d
Aguilar
Makefile
:
f
ix default
reg
e
x settings on D
a
rwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
Dav
i
d A
g
uilar
mergetools/kdiff3: do not use --auto when diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
help
.
c: add a compatibility comment t
o
cmd_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
contri
b
/
m
w-
t
o-git/
t
/install
-
wiki
.
sh:
use a
l
owercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
contrib/exam
p
l
e
s/
g
it-remote
.
perl: use
a
lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
test
s
:
use a
l
o
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
id Aguilar
g
i
t-
s
vn:
u
s
e a lowe
r
case "
u
sage:" st
r
in
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
Do
c
umentat
i
on/user-m
a
n
u
al
.
t
x
t: us
e
a lowerc
a
se "usag
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
templates/hooks--update
.
s
a
m
ple: use
a
lowercase "u
s
age
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
contrib/hooks/setgitperms
.
perl: us
e
a lowercase "us
a
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
c
ontrib/
e
xamples: use
a
lowercase
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
contrib/fas
t
-imp
o
rt/import-zips
.
py: use spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
contrib/fa
s
t-import/import-zips
.
py: fix
b
r
oken er
r
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib/fast-import: us
e
a lo
w
ercase "
u
sage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
cont
r
ib/credential: use
a lo
w
e
rcase "u
s
age:" st
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
gi
t
-cv
s
import
:
use a lowercase
"
usage:" str
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Aguilar
git-cvsimport: use a lowerca
s
e
"us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Aguilar
git-c
v
sexpo
r
tcommit: use a lowercase
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d
A
g
uilar
git
-
archimp
o
r
t: use a lowerc
a
se "usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-merge-one-file: us
e
a low
e
r
case "usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
lar
git-relink: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguil
a
r
git-svn: use a lowerc
a
s
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
ilar
git-sh-setup: use
a low
e
rcase "usage
:
" s
t
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
Aguilar
t78
0
0:
"def
a
ults
"
i
s no longer a builtin too
l
name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
u
i
lar
t7800: modernize t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
avid Aguilar
t7800: update copyrigh
t
notic
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Ag
u
ilar
dif
f
tool: silence uni
n
i
tial
i
zed
v
a
ri
a
ble
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Agu
i
lar
difftool--helper:
f
ix printf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate a list
o
f val
i
d
merge tool
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
A
guilar
mergetool-
-
lib: add functions for finding ava
i
l
a
ble
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
merge
t
ool--lib
:
improve the
h
elp text
i
n
g
ues
s
_merge
_
tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguila
r
merge
t
ool-
-
l
ib: simplify command express
i
ons
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
merget
o
ols: simplify how we
h
andle "v
i
m
"
and "
d
efaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
i
l
ar
m
e
r
g
etool--lib: imp
r
o
v
e show_to
o
l_help
(
) out
p
ut
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
merget
o
ols/vim: remove red
u
ndant diff comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Agu
i
l
a
r
mergetools/p4merge
:
Honor $TMPDIR for the /de
v
/
n
ull
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David A
g
uilar
me
r
getools/p4merge: Handle "/
d
e
v
/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguila
r
mergetool--lib:
A
llow cust
o
m commands to ov
e
rride built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agu
i
lar
gitk: Rename 'tagcontents' to 'cache
d
_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Agui
l
a
r
gitk: Te
a
ch
"
Rere
a
d re
f
ere
n
ces" to reload
t
ags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid A
g
uilar
mergetool,diff
t
ool: Do
c
ument -
-
tool-help
c
on
s
i
s
te
n
tly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Agui
l
a
r
dif
f
t
ool: Disable --
s
ymlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d A
g
uilar
dif
f
tool: Handle
c
ompare() returning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
d
i
fftoo
l
: Wrap long lines for readabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Agui
l
ar
difft
o
ol: Check a
l
l r
e
turn codes from com
p
are()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
difftool: Handle finding m
e
rgetoo
l
s
/ in a
path wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool: Use sy
m
links when
d
iffin
g
agains
t
the
workt
r
ee
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
diffto
o
l: Call t
h
e temp di
r
ect
o
ry "git-di
f
f
t
ool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguil
a
r
diff
t
oo
l
: Move option values into a
h
a
sh
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: Eliminate gl
o
bal va
r
iabl
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
dif
f
tool: Simplify
p
rint_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
Agu
i
l
a
r
t
7
800: Test difftool passing ar
g
uments to
d
i
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David A
g
uilar
me
r
getool: Provid
e
a
n e
m
pty file whe
n
n
e
ede
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d
A
guilar
Makefile: Improve compiler h
e
ader dependency che
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
me
r
get
o
o
l
s/meld:
U
se '
-
-output
'
when av
a
ilable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool--lib: R
e
f
a
c
t
or tool
s
into
s
eparate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next