repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
contrib/subtree: ignore log.date configuration
2015-07-23
David Aguilar
contrib/subtr
e
e
:
i
g
nore log
.
date
configu
r
ation
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
D
av
i
d A
g
u
i
lar
me
r
getools: sto
p
sett
i
ng $stat
u
s in m
e
rge_cmd()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David
Aguilar
m
e
rget
o
ol:
s
i
m
plify c
o
nditionals
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difftool--helper: add explicit
exit stateme
n
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguilar
m
erget
o
o
l
-
-lib: remove use of $status global
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-11-14
David Aguilar
difft
o
ol:
honor --trus
t
-exit-code for builtin tool
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-28
David Agu
i
lar
d
i
fftool: a
d
d suppor
t
for --trust-exit-code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
t
7
6
10-mergetool
:
add test cases f
o
r
m
ergetool
.
write
T
oT
e
mp
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
me
r
getool: add an option for writing to a tempora
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merge
t
o
o
l: use more cons
e
rv
a
tive temp
o
rary f
i
lenames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Agui
l
ar
te
s
t-lib-functions: adjust style to
m
atch Codin
g
Guidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
t7610-merget
o
ol: use
t
e
st
_
c
o
n
f
ig to isolate tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
mergetools/m
e
ld:
m
ake usage of
`
-
-
out
p
u
t
` configurabl
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
git
-
s
h
-setup: move GIT_DIR initialization i
n
to a functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Ag
u
il
a
r
merget
o
ol:
u
se mo
r
e conserva
t
i
v
e t
e
mporar
y
fi
l
enames
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
test-lib-functi
o
n
s: adjust sty
l
e
t
o match Codin
g
Guidelines
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t7
6
10-mergetool: prefer tes
t
_co
n
fig
over g
i
t c
o
nfi
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
Ag
u
ila
r
t7610-merget
o
ol: add
miss
i
ng && and remove comme
n
ted
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
l
a
r
t7610-mer
g
etool: use tab
s
i
nst
e
a
d
of a mix of
t
abs
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-10-07
David
A
g
u
ila
r
completion: add --
s
how-
s
ignatu
r
e for l
o
g
an
d
sh
o
w
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
D
avi
d
Agui
l
a
r
stas
h
: prefer --quiet over she
l
l
r
e
dire
c
tion of
t
he
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d Aguilar
refs: mak
e
r
ev-parse --quiet act
u
ally qu
i
e
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-16
D
a
vi
d
Aguilar
t1503: use
test
_
mus
t
_be_
e
m
pty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentation:
a
no
t
e about s
t
dout for
git rev-p
a
rse
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
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
David Aguilar
stylef
i
x: aste
r
i
s
ks sti
c
k to the variable
,
not
t
he
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
gitk: Catch mk
d
t
emp errors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Use
mktem
p
-d to avoi
d
predictable t
e
mporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Honor TMPDIR w
h
en
viewing external
diffs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-02-24
David Agu
i
la
r
difftool: suppo
r
t reposit
o
ries wi
t
h
.
git-fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
Dav
i
d
Agui
l
a
r
p
ull: add
-
-
ff-only to the help
text
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pu
l
l: add pu
l
l
.
ff confi
g
urat
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David Ag
u
ilar
imap-send: eliminate HMAC de
p
recati
o
n warnings on
M
ac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
cache
.
h: e
l
iminat
e
SH
A
-1 d
e
precat
i
on warnings on Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
av
i
d
Aguil
a
r
Makefile
:
ad
d
su
p
po
r
t for Apple CommonCrypto fac
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
D
avid Aguil
a
r
Makef
i
le: fix de
f
ault rege
x
settings on Dar
w
in
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Aguila
r
mergetools/
k
d
iff3: do not use --auto when di
f
f
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
David
A
guilar
help
.
c: add
a
compatibi
l
ity commen
t
to cmd_version
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
contrib/mw-to-
g
i
t/t/install-wiki
.
sh: u
s
e a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
cont
r
ib
/
ex
a
m
p
les/gi
t
-remote
.
p
e
r
l
: use a low
e
rca
s
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
avid
A
guilar
tests: use a lowercase "u
s
a
ge
:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Ag
u
ila
r
g
it-svn: us
e
a lowerca
s
e
"usag
e
:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
Aguilar
Documenta
t
ion
/
user-manual
.
txt: use
a lowe
r
cas
e
"usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
te
m
p
lates/h
o
oks--update
.
s
a
m
ple:
u
se a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uilar
contr
i
b/hooks/s
e
tgitperms
.
perl: use a
l
o
wercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
ila
r
contrib/exam
p
les:
use a lowercase "usage:"
s
t
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
co
n
trib
/
fa
s
t-i
m
port/import-zi
p
s
.
py: use
spaces
i
nstead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fas
t
-
imp
o
rt/import-zips
.
py: fix br
o
ken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
contrib/
f
a
s
t-import: use a lowercase
"
usage
:
"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
tri
b
/c
r
ed
e
ntial:
u
se a lowerc
a
s
e
"usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguila
r
git-cvsi
m
port: use a lowercase "usage
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-cvsimport:
u
se
a
lowerc
a
s
e "usage:" st
r
in
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsex
p
ortcommit:
u
se a lowe
r
c
ase "
u
sage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-archimpor
t
: use a lower
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Agu
i
lar
git-merge-one-
f
ile: u
s
e a lowercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: us
e
a
lowercase "
u
sage:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
i
lar
git-svn
:
use a
l
owercase "usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
lar
git-sh-setup: use a
lowercase "usage:" st
r
in
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Aguila
r
t7800: "defaults" is no lo
n
ger
a
built
i
n
t
ool name
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: mode
r
nize
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
Da
v
id
A
guilar
t78
0
0: update copyright notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David
A
guilar
d
i
ffto
o
l:
silence uninitialize
d
variable wa
r
ning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
Aguilar
p4merge: fi
x
printf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
difftool--
h
elper: fix prin
t
f us
a
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
doc:
g
e
nerate a
l
ist
o
f v
a
lid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib: add functi
o
ns for finding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguila
r
mergetool--lib: improve the help t
e
xt in guess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergeto
o
l--lib:
simplify comma
n
d expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguil
a
r
me
r
getools: si
m
plify
how we handle "vim" and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uil
a
r
mergetool-
-
lib: impro
v
e show_tool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mer
g
etools/vim: remove red
u
ndant di
f
f command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/p4mer
g
e: Honor $T
M
PD
I
R
f
o
r the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
Aguilar
mer
g
eto
o
ls/p4merge: Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
D
a
vid
A
guilar
mergeto
o
l
--
l
ib:
Allow c
u
stom c
o
mmands to override
b
u
ilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
git
k
: R
e
name 'tagc
o
n
t
ents' to 'ca
c
hed_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: Tea
c
h
"Rer
e
ad ref
e
rences" to r
e
load
t
ags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
David Agu
i
lar
mergetool,difft
o
ol: Document --
t
ool-help con
s
isten
t
ly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
av
i
d
Aguilar
d
i
fftool:
D
isable --symlinks on c
y
gwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
too
l
: Handle
com
p
a
r
e() r
e
turning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d A
g
u
i
l
ar
d
iff
t
ool: Wrap long lines for read
a
bility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d
A
guilar
di
f
ftool: C
h
eck al
l
ret
u
rn codes from co
m
pare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool: Handle find
i
ng merge
t
ools
/
i
n a pa
t
h w
i
th
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks when diffing ag
a
inst the w
o
rkt
r
ee
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Cal
l
t
h
e temp director
y
"gi
t
-diff
t
ool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
diffto
o
l
:
M
o
v
e
option
v
alues into a
hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d
Aguil
a
r
difftool: Eliminate global v
a
ri
a
bles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
dif
f
tool:
S
i
mplify
p
rint_tool_he
l
p()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Agu
i
lar
t7800: Tes
t
dif
f
tool
p
a
s
sing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
avid
A
gui
l
ar
me
r
getool
:
Provid
e
a
n
e
m
pty
f
il
e
when
n
eeded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Aguilar
Makef
i
le: Improv
e
compi
l
er header dependency ch
e
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguila
r
mergetoo
l
s/meld:
Use '--o
u
tput' when av
a
ila
b
le
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agu
i
lar
mergetool
-
-
l
ib: Refactor tool
s
i
nto separate
f
iles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
mer
g
etool-
-
lib: Make style cons
i
stent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
difftool--helper: Make style consi
s
tent w
i
th git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguil
a
r
t/t7503-pre-commit-hook
.
s
h
: Add G
I
T_PREFIX
t
e
sts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
i
t-mergetool--
l
ib: Make
v
imdiff retain
t
he current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Ag
u
ilar
git: Remove ha
n
dli
n
g
for GIT_PREFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
se
t
up: Provide GIT_PR
E
FIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Ag
u
ilar
su
b
m
o
dule sync:
Update "submodule
.
<
name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip autoresol
v
ed paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next