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
prefer git_pathdup to git_path in some possibly-dangerous cases
2015-07-23
David Aguilar
contrib/subtree: ignore l
o
g
.
date confi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David
Aguilar
mergetools
:
add winmer
g
e
as a builtin
t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d Aguilar
mergeto
o
l
-
-lib: set IFS for diffto
o
l and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vi
d
Aguilar
mergetools: st
o
p setting $stat
u
s in merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
m
erget
o
ol: simpli
f
y con
d
itiona
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id
Aguila
r
d
i
f
f
tool--helper:
add explici
t
exit statemen
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetoo
l
--lib: remove
u
s
e of
$
status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David
Agu
i
lar
difftool: honor --trust-exit-code for
b
u
i
ltin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
a
vid Aguilar
difftool: ad
d
support for --trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guila
r
t7610-mergetool: add test case
s
for mergeto
o
l
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool:
add a
n
op
t
ion for
writing to a tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
mergetool: use
m
ore conservative temporar
y
file
n
a
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid
Aguilar
test-l
i
b
-functions: adjust
s
tyle to match Coding
G
uidel
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
A
guilar
t76
1
0-merg
e
tool: use t
e
st_
c
o
n
f
i
g
to is
o
late tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ila
r
merget
o
ols/me
l
d: make
usage of `--ou
t
p
ut` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
g
i
t-sh-setup: move GIT_DIR
ini
t
i
a
lization into a
fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid A
g
uilar
m
e
rget
o
ol: us
e
more co
n
servativ
e
tempor
a
ry filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
test
-
lib
-
functio
n
s
:
adjus
t
style
t
o match
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t
7610-me
r
getool: prefer t
e
st_conf
i
g over git
conf
i
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
t7
6
10-merge
t
ool:
a
dd missing && and remove commen
t
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
t7610-mergetool: use
t
ab
s
instead o
f
a mix of ta
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
A
guilar
completion: a
d
d --show-signatur
e
for log
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
s
tash: prefer --quiet over shell redi
r
e
c
tion of
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d Ag
u
il
a
r
refs: make re
v
-parse --quiet
a
c
tually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David
Agu
i
lar
t15
0
3: use
t
e
s
t_must_be_empt
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
A
gu
i
lar
D
ocum
e
ntation:
a
note abou
t
stdout for
g
it rev
-
par
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id Aguilar
cl
e
anups:
e
nsu
r
e
t
hat git-compat-util
.
h is
i
n
cluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Dav
i
d Ag
u
ilar
s
t
yl
e
fix: ast
e
risks stick to the va
r
iable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Agu
i
l
a
r
gi
t
k:
C
atch mkd
t
emp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Ag
u
i
l
ar
gitk: Use mktemp -d to avoid predictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
guil
a
r
gitk: Honor TMPDIR when viewi
n
g
e
xternal dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Agui
l
ar
difftool
:
s
u
p
port re
p
osito
r
i
e
s with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
Aguilar
pull: add --ff-only
to
t
he help tex
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: ad
d
p
u
ll
.
ff c
o
nfiguration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
i
d
Ag
u
i
lar
imap-se
n
d: eliminate
HMAC dep
r
e
c
a
tio
n
warnings on Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Aguilar
cache
.
h: e
l
iminate SHA-1 deprecati
o
n warni
n
gs on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: add support for Apple CommonCrypto facil
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
i
d Agu
i
lar
Make
f
ile: fix
d
efaul
t
r
e
gex settings
o
n Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
merge
t
ool
s
/kdiff3: do not use --
a
u
t
o when
d
i
f
fing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agui
l
ar
h
e
l
p
.
c
:
a
dd a compatibil
i
ty comment to cmd
_
ve
r
sion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
contrib/mw-to-gi
t
/
t
/ins
t
all-wiki
.
s
h
:
u
se
a lowerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Ag
u
ilar
c
o
ntrib/exam
p
l
e
s/git-remote
.
perl:
use a lo
w
e
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tes
t
s: use a
lowercase
"usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
g
it-svn:
u
se a lowercase "
u
sage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
Documentation/user-manual
.
txt: use
a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agu
i
l
a
r
templ
a
tes/hoo
k
s-
-
update
.
sam
p
le
:
use a lower
c
ase "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib
/
hooks/se
t
git
p
erms
.
perl: use a lowerc
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
c
o
ntrib
/
e
x
amp
l
es: use a lowe
r
c
a
se "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
on
t
r
i
b/fast-i
m
port/import-zips
.
py:
u
s
e spaces ins
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
c
o
ntrib/fa
s
t-
i
mp
o
rt/import-zips
.
py: fix broke
n
er
r
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b/fast-import: use a lowe
r
case "usage:"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
co
n
trib/cr
e
d
e
ntial:
u
se a lowercase "u
s
age:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsim
p
ort: u
s
e a lowercase "usage:"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guilar
git-cvsimpo
r
t: use a
l
owercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agui
l
ar
git
-
cvsexpor
t
commit:
u
s
e
a l
o
wercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-arc
h
import: use a lowerca
s
e
"usage:" st
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-merge-one-
f
ile: use a lower
c
ase
"
usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid A
g
uila
r
git
-
r
elink: use a l
o
wercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
g
i
t-svn
:
use a
l
o
w
erc
a
s
e
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-sh-
s
etup: u
s
e
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t
7
8
0
0: "defaults" is
no longer a
b
uiltin tool nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uilar
t7800:
m
o
de
r
nize t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Dav
i
d A
g
uilar
t7800: up
d
ate
co
p
yright n
o
t
i
ce
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Davi
d
Agui
l
a
r
d
ifftool:
s
ilence u
n
initialized
varia
b
le warni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id
Aguilar
p4m
e
rge: fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Agu
i
lar
di
f
ftool--helper:
f
ix printf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Agui
l
ar
doc: generate
a li
s
t of valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
ergetool
-
-
lib: add functions f
o
r finding
a
vai
l
abl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
-
-lib
:
improve the help text
i
n guess_merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid
A
guilar
merg
e
tool--lib:
s
implify command expre
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
tool
s
: simplify how w
e
h
an
d
le
"
vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
gu
i
lar
mer
g
etool--
l
ib
:
i
mpr
o
ve
s
how_tool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agu
i
lar
merget
o
ol
s
/vim: rem
o
ve redundant dif
f
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
av
i
d A
g
uilar
mergeto
o
ls/p4merge: Hon
o
r
$TMPDIR
f
o
r the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avi
d
Aguilar
merge
t
ools/p4merge: Handle "/dev/
n
ull"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d Agui
l
ar
me
r
ge
t
oo
l
--
l
ib: Allow
c
ustom commands to ov
e
rrid
e
bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
A
g
uilar
gi
t
k:
R
ename 'tagcontents' to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguilar
gitk: Teach "Reread referenc
e
s
" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agu
i
lar
mergetool,
d
iff
t
o
o
l: Docume
n
t --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difft
o
o
l
: Disable -
-
symlinks
o
n c
y
gwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
difftool: Ha
n
dle co
m
p
are()
r
etu
r
nin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap l
o
ng lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
difftool: Check
a
ll return codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguila
r
difftool: Hand
l
e findin
g
mergetool
s
/ in
a
path wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
iffto
o
l: Use symlinks when
di
f
f
i
ng against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
difftool: Call the temp dir
e
ctory "git-di
f
ftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool: Move option val
u
es in
t
o
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguil
a
r
difftool: Eliminate global
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Agu
i
lar
difftool: Si
m
p
lify print_
t
ool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
vid Ag
u
ilar
t7800: Test difftool passing arguments to
d
iff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid
Aguilar
m
ergetoo
l
: Provide an empty fi
l
e when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid Aguilar
Mak
e
file: Improve compiler header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetools/m
e
ld: Use '
-
-outp
u
t' wh
e
n available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Aguila
r
m
ergetool--lib: R
e
factor t
o
o
ls i
n
to separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
m
erget
o
o
l--li
b
: Make
s
tyle
cons
i
stent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guila
r
difftool--helper
:
Make
s
tyle consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t
/
t7503-pre-com
m
i
t-
h
ook
.
sh: Add GIT_PREFIX te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-m
e
rgetool--lib:
Make vimdiff reta
i
n
t
he current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
Aguil
a
r
g
i
t
:
Remove ha
n
d
l
ing
f
or GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
s
e
tup:
P
r
o
vide GIT_P
R
EFIX to built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next