repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: sanitize $workdir as early as possible
2016-12-12
Dav
i
d
A
guilar
difftool
:
sa
n
itize $workdir as early as possible
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-12-12
David
A
guil
a
r
difftool: fix dir
-
diff index creation when in
a sub
d
irecto
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
D
avid
A
guilar
difftool:
use Git::* func
t
i
o
ns in
s
tead of pass
i
ng around
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-07-28
David Agu
i
la
r
d
ifftool
:
avoid $GIT_DIR
a
n
d $G
I
T
_
W
O
R
K_TREE
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
David Ag
u
ilar
difftool: h
a
n
d
le unmerged files in dir-di
f
f mode
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-05-16
D
a
vid Aguilar
di
f
ftool: initialize variables for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
mergetool:
h
onor tempfile c
o
nfigurati
o
n
when resolving
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2016-03-10
David Aguil
a
r
mergetool: sup
p
ort delete/
d
elete con
f
licts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-10-29
Dav
i
d
A
g
uilar
difft
o
ol: ignor
e
symbolic li
n
ks in
use_wt_file
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-07-23
David
A
guilar
co
n
t
r
i
b/subtree
:
ignore log
.
da
t
e con
f
iguration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergetools: add winme
r
ge as a builtin tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d
A
guilar
mergetoo
l
--lib: se
t
IFS for di
f
f
t
ool
a
nd mergetool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David
A
guilar
me
r
getools
:
stop setting $status
i
n merge_cmd()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid
A
gui
l
ar
mergetool: simplify
c
o
n
ditionals
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David A
g
ui
l
ar
d
if
f
tool--h
e
lper: add explicit exit statem
e
n
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool--lib: re
m
o
v
e us
e
of
$status g
l
obal
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
Dav
i
d Aguilar
dif
f
tool: hon
o
r --trust-exit-code for builtin tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
D
a
vid Aguilar
difftool
:
a
dd suppor
t
f
or -
-
tr
u
st-e
x
it-cod
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
av
i
d
A
g
ui
l
ar
t7610-
m
ergetool: add test c
a
s
e
s fo
r
merge
t
o
o
l
.
writeT
o
Te
m
p
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguila
r
mergetool: add an
o
ption
f
o
r writi
n
g to a temporar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
mergetool:
u
se more conse
r
v
a
tiv
e
temporary filenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-lib-functions: adjust sty
l
e to mat
c
h CodingGuid
e
lines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
t
7610-mergetool: use
t
est_
c
onfig to isolate
t
es
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merget
o
ols/meld: make usage of
`--output
`
config
u
rable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-s
e
tup:
m
ove
GIT_DI
R
initialization into a funct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merget
o
ol
:
use more conservative
t
empor
a
ry filenam
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Agui
l
a
r
te
s
t-lib-functions: adjus
t
style
t
o
mat
c
h C
o
d
i
ngGuideli
n
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t7610-merget
o
o
l: pref
e
r t
e
st_config ove
r
git
con
f
ig
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
uilar
t7
6
10-merge
t
ool
:
add missin
g
&& a
n
d remo
v
e
comment
e
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
t7610-mergetool: use tabs
instead
of a mix
of tabs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
D
a
vid Aguila
r
completion:
a
dd --show-signatu
r
e fo
r
log and
show
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David Agu
i
lar
stash: prefer --quiet over she
l
l re
d
irection of the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
re
f
s:
m
ake rev-parse --quiet
a
ctually quiet
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
Davi
d
Aguil
a
r
t
1503: u
s
e t
e
st_must_be_empty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
D
ocum
e
ntation: a not
e
about stdout for git rev-parse
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David
Agui
l
ar
clean
u
ps:
e
nsure that git-compat
-
util
.
h
i
s inc
l
ud
e
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-02
David Aguil
a
r
styl
e
fix: aster
i
sks stick to
the variable, not the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
David Ag
u
ila
r
gitk:
C
atch m
k
dtemp errors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Agui
l
ar
gitk: U
s
e mkte
m
p -d to avo
i
d predictable
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David
Aguilar
gitk
:
Honor T
M
PDIR
when vi
e
win
g
e
x
ter
n
al
d
iffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David
A
g
uilar
di
f
ftool: supp
o
rt repositori
e
s with
.
git-fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
i
d
Aguil
a
r
pull: add --
f
f-only to the help tex
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
pull
:
add pull
.
ff confi
g
uration
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Agu
i
lar
imap-sen
d
:
e
l
iminate HMAC deprec
a
tio
n
war
n
ings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id Aguil
a
r
cache
.
h: eliminate SHA-
1
deprecation war
n
ings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
Makefile: add support for Apple
C
o
m
monC
r
ypto fac
i
li
t
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David Aguila
r
Makefile: fix default
r
e
g
ex settin
g
s o
n
Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David
Agu
i
lar
mergeto
o
ls/kdi
f
f3:
d
o
not use --auto when
d
iffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
he
l
p
.
c: a
d
d a compatibility
c
om
m
e
nt to cmd_
v
er
s
ion()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
contrib/mw-to-git/t/install-wiki
.
sh: use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
contrib
/
exampl
e
s
/git-remo
t
e
.
perl: use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tes
t
s
:
use a lowe
r
case
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
g
u
i
lar
git-svn: u
s
e a
l
owercas
e
"usa
g
e:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
D
o
cumentatio
n
/user-ma
n
u
a
l
.
tx
t
: use a lo
w
ercas
e
"usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agui
l
ar
tem
p
lates/ho
o
k
s--updat
e
.
sample: use a lowercase "usag
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/
h
o
oks/s
e
tgitperms
.
perl: use
a
lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
ar
contrib/examples: use a lowercase "usa
g
e:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
lar
contri
b
/fast-import/import-zips
.
py: use spaces
i
nstea
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/
f
ast-import/impor
t
-zips
.
p
y: fix
b
roken erro
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fast-import:
u
se a lowercase "usage:"
stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/cred
e
n
t
ial: use a lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport: u
s
e a lowerca
s
e "usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d
Aguilar
git-cvsimport: use a lowercas
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-cvsexportco
m
mit: use a lowercase "usage:
"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
ilar
git
-
archimport: use
a l
o
wercase "
u
sage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
m
erge-one-file: use a lo
w
ercase
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-r
e
link:
u
s
e
a lo
w
e
rcase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-svn: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-sh
-
setup: u
s
e a low
e
rcase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguilar
t7800: "d
e
faults"
is n
o
l
o
n
ger a bui
l
tin
t
oo
l
name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t7800: mod
e
r
n
ize te
s
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800:
u
pdate copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d Agui
l
ar
di
f
fto
o
l
:
sile
n
c
e
u
ni
n
itia
l
ized
variable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
p4merge: fi
x
printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Agui
l
ar
difftool--helper: fix
p
r
intf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc
:
gene
r
ate a list of valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David
Aguilar
mergetool--lib: a
d
d
funct
i
ons for f
i
nding
a
vaila
b
l
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Agu
i
lar
merge
t
ool--lib:
i
m
prove t
h
e help
t
e
xt in gu
e
ss_merge_
t
ool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
tool--lib:
simp
l
if
y
c
ommand e
x
p
ression
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
tool
s
:
simp
l
i
f
y
h
ow we
hand
l
e "vim" and "de
f
aults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguila
r
m
e
rgetool--lib
:
improve show_tool_h
e
lp() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
m
ergetools/vim: r
e
mov
e
red
u
ndant diff
comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
mergetools/
p
4merge: Hono
r
$T
M
PDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Dav
i
d
Aguilar
merg
e
to
o
ls
/
p
4merge: Handle "/dev/nu
l
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid Aguilar
mer
g
etool--lib: A
l
low custom commands to overr
i
de built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gitk:
R
enam
e
'tagcontents' t
o
'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Ag
u
ilar
gi
t
k: Teach
"
Rer
e
a
d
r
e
f
e
r
e
n
ces" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid Aguilar
mergetool,d
i
fftool: Document
--tool-h
e
lp consistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
av
i
d
Aguilar
d
i
fftool: Disable
-
-s
y
mlinks on cygw
i
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: Handle compare() retur
n
ing -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Ag
u
ila
r
difftool:
Wrap lon
g
li
n
es f
o
r read
a
b
ility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check all return codes from
comp
a
re(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Agui
l
ar
dif
f
to
o
l: Handle finding
m
ergeto
o
ls/ in
a
p
a
th with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
if
f
tool:
Use symlinks w
h
en diff
i
ng against the
worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Call the temp directory "git-
d
ifftoo
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: M
o
v
e option
val
u
es into a h
a
sh
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
u
ila
r
difftool: E
l
i
m
in
a
te global
varia
b
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool
:
Simplify print
_
tool
_
help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
D
avid Aguilar
t7
8
00: Test
d
ifftool
p
a
ssing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguila
r
mergetool:
Provid
e
an e
m
pty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next